update translations

1 files changed, 2920 insertions, 2166 deletions

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:"