diff --git a/main/po/LINGUAS b/main/po/LINGUAS
index ea8fca5d..6cdc52d7 100644
--- a/main/po/LINGUAS
+++ b/main/po/LINGUAS
@@ -2,8 +2,10 @@ de
 en
 eo
 es
+eu
 fr
 it
+nb
 nl
 pt_BR
 zh_Hans
diff --git a/main/po/POTFILES.in b/main/po/POTFILES.in
index b694da08..10896f42 100644
--- a/main/po/POTFILES.in
+++ b/main/po/POTFILES.in
@@ -1,24 +1,78 @@
 data/add_conversation/add_contact_dialog.ui
 data/add_conversation/add_groupchat_dialog.ui
 data/add_conversation/conference_details_fragment.ui
+data/add_conversation/list_row.ui
+data/add_conversation/select_jid_fragment.ui
+data/chat_input.ui
+data/contact_details_dialog.ui
+data/conversation_list_titlebar.ui
 data/conversation_selector/view.ui
+data/conversation_selector/chat_row_tooltip.ui
+data/conversation_selector/conversation_row.ui
+data/conversation_summary/image_toolbar.ui
+data/conversation_summary/message_item.ui
+data/conversation_summary/view.ui
+data/manage_accounts/account_row.ui
 data/manage_accounts/add_account_dialog.ui
 data/manage_accounts/dialog.ui
 data/menu_add.ui
 data/menu_app.ui
 data/menu_conversation.ui
 data/menu_encryption.ui
+data/occupant_list.ui
+data/occupant_list_item.ui
 data/settings_dialog.ui
+data/unified_window_placeholder.ui
+
+src/main.vala
+src/ui/application.vala
+src/ui/add_conversation/chat/add_contact_dialog.vala
+src/ui/add_conversation/chat/roster_list.vala
+src/ui/add_conversation/chat/dialog.vala
 src/ui/add_conversation/conference/add_groupchat_dialog.vala
+src/ui/add_conversation/conference/conference_details_fragment.vala
+src/ui/add_conversation/conference/conference_list.vala
 src/ui/add_conversation/conference/dialog.vala
-src/ui/contact_details/muc_config_form_provider.vala
+src/ui/add_conversation/accounts_combo_box.vala
+src/ui/add_conversation/list_row.vala
+src/ui/add_conversation/select_jid_fragment.vala
+src/ui/avatar_generator.vala
+src/ui/chat_input/edit_history.vala
+src/ui/chat_input/encryption_button.vala
+src/ui/chat_input/occupants_tab_completer.vala
+src/ui/chat_input/smiley_converter.vala
+src/ui/chat_input/view.vala
 src/ui/contact_details/settings_provider.vala
+src/ui/contact_details/dialog.vala
+src/ui/contact_details/muc_config_form_provider.vala
+src/ui/conversation_list_titlebar.vala
+src/ui/conversation_selector/chat_row.vala
 src/ui/conversation_selector/conversation_row.vala
-src/ui/conversation_summary/message_item.vala
-src/ui/conversation_summary/view.vala
+src/ui/conversation_selector/groupchat_pm_row.vala
+src/ui/conversation_selector/groupchat_row.vala
+src/ui/conversation_selector/list.vala
+src/ui/conversation_selector/view.vala
+src/ui/conversation_summary/chat_state_populator.vala
+src/ui/conversation_summary/conversation_item_skeleton.vala
+src/ui/conversation_summary/conversation_view.vala
+src/ui/conversation_summary/default_message_display.vala
+src/ui/conversation_summary/file_populator.vala
+src/ui/conversation_summary/image_display.vala
+src/ui/conversation_summary/message_populator.vala
+src/ui/conversation_summary/message_textview.vala
+src/ui/conversation_summary/slashme_message_display.vala
+src/ui/conversation_titlebar/file_entry.vala
+src/ui/conversation_titlebar/menu_entry.vala
+src/ui/conversation_titlebar/occupants_entry.vala
+src/ui/conversation_titlebar/view.vala
+src/ui/manage_accounts/account_row.vala
 src/ui/manage_accounts/add_account_dialog.vala
 src/ui/manage_accounts/dialog.vala
-src/ui/occupant_menu/list.vala
-src/ui/occupant_menu/view.vala
 src/ui/notifications.vala
-src/ui/unified_window.vala
\ No newline at end of file
+src/ui/occupant_menu/list.vala
+src/ui/occupant_menu/list_row.vala
+src/ui/occupant_menu/view.vala
+src/ui/settings_dialog.vala
+src/ui/unified_window.vala
+src/ui/util/helper.vala
+src/ui/util/label_hybrid.vala
diff --git a/main/po/de.po b/main/po/de.po
index c9ad2086..0bb02cfe 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,10 +2,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
-"PO-Revision-Date: 2017-08-14 21:07+0000\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/dino/translations/de/>\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"PO-Revision-Date: 2017-09-06 22:45+0000\n"
+"Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,9 +14,10 @@ msgstr ""
 "X-Generator: Weblate 2.17-dev\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -57,7 +58,7 @@ msgstr "Passwort"
 msgid "Join on startup"
 msgstr "Beim Start beitreten"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Suchen"
 
@@ -67,7 +68,7 @@ msgid "Save"
 msgstr "Speichern"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Lokaler Alias"
 
@@ -75,22 +76,29 @@ msgstr "Lokaler Alias"
 msgid "Accounts"
 msgstr "Konten"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Keine Konten aktiv"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Konto hinzufügen"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Konferenz beitreten"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -98,9 +106,9 @@ msgstr "Einstellungen"
 msgid "Quit"
 msgstr "Beenden"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
-msgstr "Kontakt Details"
+msgstr "Kontaktdetails"
 
 #: data/menu_encryption.ui:14
 msgid "Unencrypted"
@@ -110,11 +118,11 @@ msgstr "Unverschlüsselt"
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "Sende Tippbenachrichtigungen"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "Sende Lesebestätigung"
 
@@ -126,13 +134,51 @@ msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
 msgid "Convert smileys to emojis"
 msgstr "Smileys zu Emojis umwandeln"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Beitreten"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+msgid "Start"
+msgstr "Starten"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Weiter"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Beitreten"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokale Einstellungen"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "An"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Aus"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Nur bei Erwähnung"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+msgid "Default: %s"
+msgstr "Standard: %s"
+
+#: src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
+msgstr "Konferenzdetails"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -167,9 +213,8 @@ msgid "Who may discover real JIDs?"
 msgstr "Wer erfährt echte JIDs?"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
-msgstr ""
-"Password, welches benötigt wird um den Raum zu betreten. Leer bedeutet keins"
+msgid "Password required to enter the room. Leave empty for none"
+msgstr "Passwort zum Betreten des Raums. Leer bedeutet keins"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:66
 msgid "Moderated"
@@ -195,190 +240,190 @@ msgstr "Chatverlauf"
 msgid "Maximum number of history messages returned by the room"
 msgstr "Anzahl der für diesen Raum gespeicherten Nachrichten"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "Raum Konfiguration"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "Standard"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "An"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "Aus"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "Nur bei Erwähnung"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "Lokale Einstellungen"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "vor %i min"
-msgstr[1] "vor %i mins"
+msgstr[1] "vor %i min"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "Gerade eben"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "tippt gerade..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "hat aufgehört zu tippen"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d. %b, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d. %b, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "tippt gerade..."
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "hat aufgehört zu tippen"
+#: src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Nachricht zu lang"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Kontaktbild auswählen"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Auswählen"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
-msgstr "Verbinden..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+msgid "Connecting…"
+msgstr "Verbinden…"
+
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Passwort falsch"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Fehler"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Eigentümer"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrator"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Mitglied"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Gast"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Private Unterhaltung beginnen"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Annehmen"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Eigentümer"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Administrator"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Mitglied"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Gast"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Einladen"
+
+#: src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Zur Konferenz einladen"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Private Unterhaltung beginnen"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Herauswerfen"
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "Keine Konten aktiv"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Konten verwalten"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "Keine Unterhaltung aktiv"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Chat hinzufügen"
+#~ msgid "Add Chat"
+#~ msgstr "Chat hinzufügen"
 
 #~ msgid "Name"
 #~ msgstr "Name"
diff --git a/main/po/dino.pot b/main/po/dino.pot
index 14210fe7..f4cdc091 100644
--- a/main/po/dino.pot
+++ b/main/po/dino.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,9 +19,10 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr ""
 
@@ -62,7 +63,7 @@ msgstr ""
 msgid "Join on startup"
 msgstr ""
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr ""
 
@@ -72,7 +73,7 @@ msgid "Save"
 msgstr ""
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr ""
 
@@ -80,22 +81,28 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr ""
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr ""
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr ""
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr ""
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr ""
 
@@ -103,7 +110,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr ""
 
@@ -115,11 +122,11 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr ""
 
@@ -131,12 +138,51 @@ msgstr ""
 msgid "Convert smileys to emojis"
 msgstr ""
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr ""
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+msgid "Start"
+msgstr ""
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr ""
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
 msgstr ""
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
@@ -172,7 +218,7 @@ msgid "Who may discover real JIDs?"
 msgstr ""
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
+msgid "Password required to enter the room. Leave empty for none"
 msgstr ""
 
 #: src/ui/contact_details/muc_config_form_provider.vala:66
@@ -199,187 +245,184 @@ msgstr ""
 msgid "Maximum number of history messages returned by the room"
 msgstr ""
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
 msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr ""
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr ""
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr ""
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr ""
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr ""
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
+#: src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
 msgstr ""
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+msgid "Connecting…"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr ""
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr ""
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr ""
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr ""
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr ""
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr ""
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr ""
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr ""
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr ""
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr ""
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr ""
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr ""
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr ""
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr ""
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr ""
-
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
index ef3e62fe..0f10df97 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
 "PO-Revision-Date: 2017-06-19 20:29+0000\n"
 "Last-Translator: Tirifto <tirifto@posteo.cz>\n"
-"Language-Team: Esperanto "
-"<https://hosted.weblate.org/projects/dino/translations/eo/>\n"
+"Language-Team: Esperanto <https://hosted.weblate.org/projects/dino/"
+"translations/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,10 @@ msgstr ""
 "X-Generator: Weblate 2.15-dev\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -63,7 +64,7 @@ msgstr "Pasvorto"
 msgid "Join on startup"
 msgstr "Aliĝi je lanĉo"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Serĉi"
 
@@ -73,7 +74,7 @@ msgid "Save"
 msgstr "Konservi"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Loka kaŝnomo"
 
@@ -81,22 +82,29 @@ msgstr "Loka kaŝnomo"
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Neniuj aktivaj kontoj"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Aldoni konton"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Ekbabili"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Aliĝi al Kunveno"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Agordoj"
 
@@ -104,7 +112,7 @@ msgstr "Agordoj"
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "Kontaktaj Detaloj"
 
@@ -116,11 +124,11 @@ msgstr "Neĉifrita"
 msgid "Preferences"
 msgstr "Preferoj"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "Sciigi pri tajpado"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "Sendi mesaĝmarkilon"
 
@@ -132,13 +140,54 @@ msgstr "Sciigi pri envenaj mesaĝoj"
 msgid "Convert smileys to emojis"
 msgstr "Grafikigi tekstajn mienetojn"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Aliĝi"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Ekbabili"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Sekva"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Aliĝi"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Sciigoj"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokaj Agordoj"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Ek"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "For"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Nur menciite"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Implicita"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Kontaktaj Detaloj"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -173,8 +222,10 @@ msgid "Who may discover real JIDs?"
 msgstr "Kiu rajtas eltrovi verajn JID-ojn?"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
-msgstr "Pasvorto necesa por eniri la ĉambron. Lasu malplenan por neniu pasvorto"
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
+msgstr ""
+"Pasvorto necesa por eniri la ĉambron. Lasu malplenan por neniu pasvorto"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:66
 msgid "Moderated"
@@ -200,187 +251,190 @@ msgstr "Mesaĝa historio"
 msgid "Maximum number of history messages returned by the room"
 msgstr "Maksimuma nombro da historiaj mesaĝoj donotaj de la ĉambro"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "Ĉambraj Agordoj"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "Implicita"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "Ek"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "For"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "Sciigoj"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "Nur menciite"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "Lokaj Agordoj"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "Antaŭ %i minuto"
 msgstr[1] "Antaŭ %i minutoj"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "Ĵus"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "tajpas…"
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "ĉesis tajpi"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "tajpas…"
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "ĉesis tajpi"
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Mesaĝa historio"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Aldoni Konton"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Elekti profilbildon"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Elekti"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "Konektata…"
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Konektita"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Malkonektita"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Malĝusta pasvorto"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Eraro"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Posedanto"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administranto"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Ano"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Uzanto"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Komenci privatan interparolon"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Abona peto"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Akcepti"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Posedanto"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Administranto"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Ano"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Uzanto"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Aliĝi al Kunveno"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Komenci privatan interparolon"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "Neniuj aktivaj kontoj"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Administri kontojn"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "Neniu aktiva interparolo"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Aldoni Babilon"
+#~ msgid "Add Chat"
+#~ msgstr "Aldoni Babilon"
diff --git a/main/po/es.po b/main/po/es.po
index a3dc0968..1c8d752b 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
 "PO-Revision-Date: 2017-08-13 17:59+0000\n"
 "Last-Translator: sergio <srg.dev@posteo.net>\n"
-"Language-Team: Spanish "
-"<https://hosted.weblate.org/projects/dino/translations/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
+"translations/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,10 @@ msgstr ""
 "X-Generator: Weblate 2.16\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -63,7 +64,7 @@ msgstr "Contraseña"
 msgid "Join on startup"
 msgstr "Unirse al inicio"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Buscar"
 
@@ -73,7 +74,7 @@ msgid "Save"
 msgstr "Guardar"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Alias local"
 
@@ -81,22 +82,29 @@ msgstr "Alias local"
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "No hay cuentas activas"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Añadir una cuenta"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Iniciar Conversación"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Unirse a Conversación en grupo"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -104,7 +112,7 @@ msgstr "Ajustes"
 msgid "Quit"
 msgstr "Salir"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "Detalles del contacto"
 
@@ -116,11 +124,11 @@ msgstr "Sin cifrar"
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "Enviar notificaciones cuando escribes"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "Enviar confirmación al recibir y al leer los mensajes"
 
@@ -132,13 +140,54 @@ msgstr "Notificar cuando llega un nuevo mensaje"
 msgid "Convert smileys to emojis"
 msgstr "Convertir smileys en emojis"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Unirse"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Iniciar Conversación"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Unirse"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Ajustes"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Sí"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "No"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Solo cuando te mencionan en la conversación"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Por defecto"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Detalles del contacto"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -173,7 +222,8 @@ msgid "Who may discover real JIDs?"
 msgstr "¿Quién puede ver los JIDs reales?"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
 msgstr ""
 "Contraseña requerida para entrar en la conversación en grupo. Dejar vacío "
 "para no requerir contraseña"
@@ -202,187 +252,190 @@ msgstr "Histórico de mensajes"
 msgid "Maximum number of history messages returned by the room"
 msgstr "Número máximo de mensajes que se almacenan en servidor"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "Configuración de la conversación en grupo"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "Por defecto"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "Sí"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "No"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "Solo cuando te mencionan en la conversación"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "Ajustes"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "hace %i min"
 msgstr[1] "hace %i mins"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "Ahora"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "está escribiendo..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "ha dejado de escribir"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "está escribiendo..."
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "ha dejado de escribir"
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Histórico de mensajes"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Añadir Cuenta"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Seleccionar imagen de perfil"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "Conectando..."
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Error"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Propietario"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrador"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Miembro"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Usuario"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Iniciar conversación privada"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Solicitud de suscripción"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Denegar"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Propietario"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Administrador"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Miembro"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Usuario"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Unirse a Conversación en grupo"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Iniciar conversación privada"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "No hay cuentas activas"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Gestionar cuentas"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "No hay conversación activa"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Añadir conversación"
+#~ msgid "Add Chat"
+#~ msgstr "Añadir conversación"
diff --git a/main/po/eu.po b/main/po/eu.po
new file mode 100644
index 00000000..1dfe2790
--- /dev/null
+++ b/main/po/eu.po
@@ -0,0 +1,439 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"PO-Revision-Date: 2017-09-15 16:45+0000\n"
+"Last-Translator: Aitor Beriain <beriain@bitmessage.ch>\n"
+"Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
+"eu/>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.17-dev\n"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+msgid "Cancel"
+msgstr "Utzi"
+
+#: data/add_conversation/add_contact_dialog.ui:23
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
+msgid "Add"
+msgstr "Gehitu"
+
+#: data/add_conversation/add_contact_dialog.ui:48
+#: data/add_conversation/add_groupchat_dialog.ui:49
+#: data/add_conversation/conference_details_fragment.ui:16
+msgid "Account"
+msgstr "Kontuak"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Ezizena"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Presentzia eguneraketak eskatu"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Ezizena"
+
+#: data/add_conversation/add_groupchat_dialog.ui:147
+#: data/add_conversation/conference_details_fragment.ui:172
+#: data/manage_accounts/add_account_dialog.ui:73
+#: data/manage_accounts/dialog.ui:166
+#: src/ui/contact_details/muc_config_form_provider.vala:62
+msgid "Password"
+msgstr "Pasahitza"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Hasieran batu"
+
+#: data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Bilatu"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Gorde"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:196
+msgid "Local alias"
+msgstr "Bertako ezizena"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontuak"
+
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Ez dago kontu aktiborik"
+
+#: data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Kontu bat gehitu"
+
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
+msgid "Start Chat"
+msgstr "Berriketa hasi"
+
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
+msgid "Join Conference"
+msgstr "Konferentziara batu"
+
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
+#: src/ui/contact_details/settings_provider.vala:30
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Irten"
+
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
+msgid "Contact Details"
+msgstr "Kontaktuaren xehetasunak"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Enkriptatu gabe"
+
+#: data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
+msgid "Send typing notifications"
+msgstr "Idazte jakinarazpenak bidali"
+
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
+msgid "Send message marker"
+msgstr "Mezu marka bidali"
+
+#: data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Mezu berri bat heltzerakoan jakinarazi"
+
+#: data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Irrifartxoak emotikono bihurtu"
+
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Batu"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Berriketa hasi"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Hurrengoa"
+
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Jakinarazpenak"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Bertako ezarpenak"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Piztuta"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Itzalita"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Soilik aipatua izaterakoan"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Lehenetsia"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Kontaktuaren xehetasunak"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:42
+msgid "Name of the room"
+msgstr "Gelaren izena"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:45
+msgid "Description of the room"
+msgstr "Gelaren deskribapena"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:48
+msgid "Persistent"
+msgstr "Iraunkorra"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:49
+msgid "The room will persist after the last occupant exits"
+msgstr "Gelak iraun egingo du azken okupatzailea irten ondoren"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:52
+msgid "Publicly searchable"
+msgstr "Publikoki bilagarria"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:55
+msgid "Occupants may change subject"
+msgstr "Okupatzaileek gaia alda dezakete"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:58
+msgid "Discover real JIDs"
+msgstr "Egiazko JIDak ikusi"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:59
+msgid "Who may discover real JIDs?"
+msgstr "Nork ikus ditzake egiazko JIDak?"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:63
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
+msgstr "Gelan sartzeko pasahitza. Utzi zuriz pasahitzik ez ezartzeko"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Moderated"
+msgstr "Moderatua"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Only occupants with voice may send messages"
+msgstr "Ahotsa duten okupatzaileek soilik bidali dezakete mezuak"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:70
+msgid "Members only"
+msgstr "Kideak soilik"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "Only members may enter the room"
+msgstr "Kideak soilik sar daitezke gelara"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:74
+msgid "Message history"
+msgstr "Mezuen historia"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Maximum number of history messages returned by the room"
+msgstr "Gelak itzuliko dituen gehienezko historiako mezuak"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:81
+msgid "Room Configuration"
+msgstr "Gelaren konfigurazioa"
+
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
+
+#: src/ui/conversation_selector/conversation_row.vala:172
+#, fuzzy, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: src/ui/conversation_selector/conversation_row.vala:176
+msgid "Yesterday"
+msgstr "Atzo"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, fuzzy, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, fuzzy, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "orain dela min %i"
+msgstr[1] "orain dela %i min"
+
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Orain"
+
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "idazten ari da..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "idazteari utzi dio"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, fuzzy, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, fuzzy, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, fuzzy, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, fuzzy, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, fuzzy, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, fuzzy, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Mezuen historia"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Kontua gehitu"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Irudia hautatu"
+
+#: src/ui/manage_accounts/dialog.vala:151
+msgid "Select"
+msgstr "Hautatu"
+
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
+msgstr "Konektatzen..."
+
+#: src/ui/manage_accounts/dialog.vala:226
+msgid "Connected"
+msgstr "Konektatuta"
+
+#: src/ui/manage_accounts/dialog.vala:228
+msgid "Disconnected"
+msgstr "Ez konektatuta"
+
+#: src/ui/manage_accounts/dialog.vala:237
+msgid "Wrong password"
+msgstr "Pasahitz okerra"
+
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
+msgid "Error"
+msgstr "Akatsa"
+
+#: src/ui/notifications.vala:103
+msgid "Subscription request"
+msgstr "Harpidetzaren eskaera"
+
+#: src/ui/notifications.vala:107
+msgid "Accept"
+msgstr "Onartu"
+
+#: src/ui/notifications.vala:108
+msgid "Deny"
+msgstr "Ukatu"
+
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Jabea"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Administratzailea"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Kidea"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Erabiltzailea"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Konferentziara batu"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Solasaldi pribatua hasi"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
+msgid "No accounts active"
+msgstr "Ez dago kontu aktiborik"
+
+#: src/ui/unified_window.vala:142
+msgid "Manage accounts"
+msgstr "Kontuak kudeatu"
+
+#: src/ui/unified_window.vala:149
+msgid "No conversation active"
+msgstr "Ez dago solasaldi aktiborik"
+
+#~ msgid "Add Chat"
+#~ msgstr "Berriketa gehitu"
diff --git a/main/po/fr.po b/main/po/fr.po
index ee9cd402..2f7b6e4c 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
 "PO-Revision-Date: 2017-07-16 08:49+0000\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/dino/translations/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,10 @@ msgstr ""
 "X-Generator: Weblate 2.16-dev\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -63,7 +64,7 @@ msgstr "Mot de passe"
 msgid "Join on startup"
 msgstr "Rejoindre au démarrage"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Rechercher"
 
@@ -73,7 +74,7 @@ msgid "Save"
 msgstr "Sauver"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Alias local"
 
@@ -81,22 +82,29 @@ msgstr "Alias local"
 msgid "Accounts"
 msgstr "Comptes"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Aucun compte actif"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Ajouter un compte"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Rejoindre une conférence"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -104,7 +112,7 @@ msgstr "Paramètres"
 msgid "Quit"
 msgstr "Quitter"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "Informations du contact"
 
@@ -116,11 +124,11 @@ msgstr "Non-chiffré"
 msgid "Preferences"
 msgstr "Préférences"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "Envoyer les notifications de frappe"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "Envoyer les marqueurs de message"
 
@@ -132,13 +140,54 @@ msgstr "Notifier l’arrivée de nouveaux messages"
 msgid "Convert smileys to emojis"
 msgstr "Convertir les smileys en émoticônes"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Rejoindre"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Commencer une discussion"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Suivant"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Rejoindre"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notifications"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Paramètres locaux"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Activé"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Désactivé"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Seulement quand mentionné"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Par défaut"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Informations du contact"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -173,7 +222,8 @@ msgid "Who may discover real JIDs?"
 msgstr "Qui peut découvrir les vrais JID ?"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
 msgstr ""
 "Un mot de passe nécessaire pour accéder au salon. Laissez vide pour aucun"
 
@@ -201,187 +251,190 @@ msgstr "Historique des messages"
 msgid "Maximum number of history messages returned by the room"
 msgstr "Nombre de messages d’historique retourné par le salon"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "Configuration du salon"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "Par défaut"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "Activé"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "Désactivé"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "Notifications"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "Seulement quand mentionné"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "Paramètres locaux"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Hier"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hh%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "Il y a %i minute"
 msgstr[1] "Il y a %i minutes"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "À l’instant"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "est en train d’écrire…"
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "a arrêté d’écrire"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %Hh%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %Hh%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %Hh%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "est en train d’écrire…"
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "a arrêté d’écrire"
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Historique des messages"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Choisir un avatar"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Choisir"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "Connexion…"
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Connecté"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Erreur"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Propriétaire"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrateur"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membre"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Utilisateur"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Commencer une discussion privée"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Demande d’abonnement"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Refuser"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Administrateur"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Membre"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Utilisateur"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Rejoindre une conférence"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Commencer une discussion privée"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "Aucun compte actif"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Gérer les comptes"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "Aucune discussion en cours"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Ajouter discussion"
+#~ msgid "Add Chat"
+#~ msgstr "Ajouter discussion"
diff --git a/main/po/it.po b/main/po/it.po
index 5cdde2f7..12f0eb73 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,22 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
-"PO-Revision-Date: 2017-08-14 11:17+0000\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"PO-Revision-Date: 2017-08-28 07:33+0000\n"
 "Last-Translator: Valerio Baldisserotto <svalo@libersoft.it>\n"
-"Language-Team: Italian "
-"<https://hosted.weblate.org/projects/dino/translations/it/>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
+"translations/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.16\n"
+"X-Generator: Weblate 2.17-dev\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -63,7 +64,7 @@ msgstr "Password"
 msgid "Join on startup"
 msgstr "Entra all'avvio"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Cerca"
 
@@ -73,7 +74,7 @@ msgid "Save"
 msgstr "Salva"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Alias locale"
 
@@ -81,22 +82,29 @@ msgstr "Alias locale"
 msgid "Accounts"
 msgstr "Accounts"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Nessun account attivo"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Aggiungi un account"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Inizia una conversazione"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Entra in una conferenza"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -104,7 +112,7 @@ msgstr "Impostazioni"
 msgid "Quit"
 msgstr "Esci"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "Dettagli del contatto"
 
@@ -116,11 +124,11 @@ msgstr "Non cifrato"
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "Invia notifiche di digitazione"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "Invia lo stato del messaggio"
 
@@ -132,13 +140,54 @@ msgstr "Notifica quando arriva un nuovo messaggio"
 msgid "Convert smileys to emojis"
 msgstr "Converte smileys in emojis"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Entra"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Inizia una conversazione"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Entra"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notifiche"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Impostazioni Locali"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Sì"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "No"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Solo se menzionato"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Default"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Dettagli del contatto"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -153,7 +202,6 @@ msgid "Persistent"
 msgstr "Persistente"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:49
-#, fuzzy
 msgid "The room will persist after the last occupant exits"
 msgstr "La stanza continuerà ad esistere dopo l'uscita dell'ultimo occupante"
 
@@ -174,15 +222,16 @@ msgid "Who may discover real JIDs?"
 msgstr "Chi può scoprire i veri JIDs?"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
-msgstr "Password richiesta per entrare nella stanza. Lasciare vuoto per nessuna"
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
+msgstr ""
+"Password richiesta per entrare nella stanza. Lasciare vuoto per nessuna"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:66
 msgid "Moderated"
 msgstr "Moderata"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:67
-#, fuzzy
 msgid "Only occupants with voice may send messages"
 msgstr "Solo gli occupanti con voce possono mandare messaggi"
 
@@ -199,191 +248,193 @@ msgid "Message history"
 msgstr "Cronologia dei messaggi"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:75
-#, fuzzy
 msgid "Maximum number of history messages returned by the room"
 msgstr "Numero massimo di messaggi in cronologia restituiti dalla stanza"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "Default"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "Sì"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "No"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "Notifiche"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "Solo se menzionato"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "Impostazioni Locali"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i minuto fa"
 msgstr[1] "%i minuti fa"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "Adesso"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "sta scrivendo..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "ha smesso di scrivere"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "sta scrivendo..."
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "ha smesso di scrivere"
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Cronologia dei messaggi"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Aggiungi Account"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Seleziona avatar"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "Connessione..."
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Password errata"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Errore"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Proprietario"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Amministratore"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membro"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Utente"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Inizia una conversazione privata"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Richiesta di sottoscrizione"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Accetta"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Rifiuta"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Proprietario"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Amministratore"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Membro"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Utente"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Entra in una conferenza"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Inizia una conversazione privata"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "Nessun account attivo"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Gestisci accounts"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "Nessuna conversazione attiva"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Aggiungi conversazione"
+#~ msgid "Add Chat"
+#~ msgstr "Aggiungi conversazione"
diff --git a/main/po/nb.po b/main/po/nb.po
new file mode 100644
index 00000000..14459cc3
--- /dev/null
+++ b/main/po/nb.po
@@ -0,0 +1,441 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"PO-Revision-Date: 2017-10-20 11:47+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
+"translations/nb_NO/>\n"
+"Language: nb_NO\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.17\n"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: data/add_conversation/add_contact_dialog.ui:23
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
+msgid "Add"
+msgstr "Legg til"
+
+#: data/add_conversation/add_contact_dialog.ui:48
+#: data/add_conversation/add_groupchat_dialog.ui:49
+#: data/add_conversation/conference_details_fragment.ui:16
+msgid "Account"
+msgstr "Konto"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Alias"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Forespør tilstedeværelsesoppdateringer"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Kallenavn"
+
+#: data/add_conversation/add_groupchat_dialog.ui:147
+#: data/add_conversation/conference_details_fragment.ui:172
+#: data/manage_accounts/add_account_dialog.ui:73
+#: data/manage_accounts/dialog.ui:166
+#: src/ui/contact_details/muc_config_form_provider.vala:62
+msgid "Password"
+msgstr "Passord"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Ta del ved oppstart"
+
+#: data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Søk"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Lagre"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:196
+msgid "Local alias"
+msgstr "Lokalt alias"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontoer"
+
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Ingen kontoer aktive"
+
+#: data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Legg til en konto"
+
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
+msgid "Start Chat"
+msgstr "Start sludring"
+
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
+msgid "Join Conference"
+msgstr "Ta del i konferanse"
+
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
+#: src/ui/contact_details/settings_provider.vala:30
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Avslutt"
+
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
+msgid "Contact Details"
+msgstr "Kontaktdetaljer"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
+#: data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
+msgid "Send typing notifications"
+msgstr "Send skrivevarsling"
+
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
+msgid "Send message marker"
+msgstr "Send meldingsmarkør"
+
+#: data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Varsle ved mottak av ny melding"
+
+#: data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Konverter smilefjes til emoji-er"
+
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Ta del"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Start sludring"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Neste"
+
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Merknader"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokale innstillinger"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "På"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Av"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Bare når nevnt"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Forvalg"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Kontaktdetaljer"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:42
+msgid "Name of the room"
+msgstr "Rommets navn"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:45
+msgid "Description of the room"
+msgstr "Beskrivelse av rommet"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:48
+msgid "Persistent"
+msgstr "Vedvarende"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:49
+msgid "The room will persist after the last occupant exits"
+msgstr "Rommet vil vedvare etter at siste deltager forlater"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:52
+msgid "Publicly searchable"
+msgstr "Offentlig søkbart"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:55
+msgid "Occupants may change subject"
+msgstr "Deltagere kan endre emne"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:58
+msgid "Discover real JIDs"
+msgstr "Oppdag ekte JID-er"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:59
+msgid "Who may discover real JIDs?"
+msgstr "Hvem har tilgang til oppdagelse av ekte JID-er?"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:63
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
+msgstr "Passord kreves for å ta del i rommet. La stå tomt for inget."
+
+#: src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Moderated"
+msgstr "Moderert"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Only occupants with voice may send messages"
+msgstr "Bare deltagere med stemme kan sende meldinger"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:70
+msgid "Members only"
+msgstr "Kun for medlemmer"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "Only members may enter the room"
+msgstr "Kun medlemmer har adgang til rommet"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:74
+msgid "Message history"
+msgstr "Meldingshistorikk"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Maximum number of history messages returned by the room"
+msgstr "Maksimalt antall meldinger med historikk som skal svares av rommet"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:81
+msgid "Room Configuration"
+msgstr "Rom-oppsett"
+
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
+
+#: src/ui/conversation_selector/conversation_row.vala:172
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: src/ui/conversation_selector/conversation_row.vala:176
+msgid "Yesterday"
+msgstr "I går"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
+
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minutt siden"
+msgstr[1] "%i minutter siden"
+
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr ""
+
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr ""
+"Du kjenner blott blodets hvisken og benpipernes bøn fra det ubevisste "
+"sjeleliv…"
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "har tatt pause i skrivinga"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr ""
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr ""
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr ""
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr ""
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr ""
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr ""
+
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Meldingshistorikk"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Legg til konto"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Velg avatar"
+
+#: src/ui/manage_accounts/dialog.vala:151
+msgid "Select"
+msgstr "Velg"
+
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
+msgstr "Kobler til…"
+
+#: src/ui/manage_accounts/dialog.vala:226
+msgid "Connected"
+msgstr "Tilkoblet"
+
+#: src/ui/manage_accounts/dialog.vala:228
+msgid "Disconnected"
+msgstr "Frakoblet"
+
+#: src/ui/manage_accounts/dialog.vala:237
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
+msgid "Error"
+msgstr "Feil"
+
+#: src/ui/notifications.vala:103
+msgid "Subscription request"
+msgstr "Abonnementsforespørsel"
+
+#: src/ui/notifications.vala:107
+msgid "Accept"
+msgstr "Godta"
+
+#: src/ui/notifications.vala:108
+msgid "Deny"
+msgstr "Nekt"
+
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Eier"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Admin"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Medlem"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Bruker"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Ta del i konferanse"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Start privat samtale"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
+msgid "No accounts active"
+msgstr "Ingen kontoer aktive"
+
+#: src/ui/unified_window.vala:142
+msgid "Manage accounts"
+msgstr "Behandle kontoer"
+
+#: src/ui/unified_window.vala:149
+msgid "No conversation active"
+msgstr "Ingen kontoer aktive"
+
+#~ msgid "Add Chat"
+#~ msgstr "Legg til sludring"
diff --git a/main/po/nl.po b/main/po/nl.po
index 47c20850..d521f818 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,22 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
-"PO-Revision-Date: 2017-06-01 13:02+0000\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"PO-Revision-Date: 2017-08-24 10:45+0000\n"
 "Last-Translator: Nathan Follens <nathan@email.is>\n"
-"Language-Team: Dutch "
-"<https://hosted.weblate.org/projects/dino/translations/nl/>\n"
+"Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
+"nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.15-dev\n"
+"X-Generator: Weblate 2.17-dev\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -63,7 +64,7 @@ msgstr "Wachtwoord"
 msgid "Join on startup"
 msgstr "Deelnemen bij opstarten"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Zoeken"
 
@@ -73,7 +74,7 @@ msgid "Save"
 msgstr "Opslaan"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Lokale alias"
 
@@ -81,22 +82,29 @@ msgstr "Lokale alias"
 msgid "Accounts"
 msgstr "Accounts"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Geen accounts actief"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Account toevoegen"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Gesprek beginnen"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -104,7 +112,7 @@ msgstr "Instellingen"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "Contactgegevens"
 
@@ -116,11 +124,11 @@ msgstr "Onversleuteld"
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "Aan-het-typen-meldingen sturen"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "Berichtmarkers sturen"
 
@@ -132,13 +140,54 @@ msgstr "Melding tonen bij nieuw bericht"
 msgid "Convert smileys to emojis"
 msgstr "Smileys omzetten naar emoji's"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Deelnemen"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Gesprek beginnen"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Volgende"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Deelnemen"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Meldingen"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokale instellingen"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Aan"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Uit"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Enkel wanneer vermeld"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "Standaard"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Contactgegevens"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -174,7 +223,8 @@ msgid "Who may discover real JIDs?"
 msgstr "Wie mag de JID's van de deelnemers zien?"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
 msgstr ""
 "Wachtwoord vereist om deel te nemen aan het groepsgesprek. Laat dit leeg als "
 "je geen wachtwoord wil"
@@ -203,187 +253,190 @@ msgstr "Berichtgeschiedenis"
 msgid "Maximum number of history messages returned by the room"
 msgstr "Maximaal aantal berichten uit geschiedenis dat groepsgesprek weergeeft"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "Gespreksconfiguratie"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "Standaard"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "Aan"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "Uit"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "Meldingen"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "Enkel wanneer vermeld"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "Lokale instellingen"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
-msgstr "%b %d"
+msgstr "%d %b"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i min geleden"
 msgstr[1] "%i min geleden"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "Zojuist"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "is aan het typen..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "is gestopt met typen"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H:%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "is aan het typen..."
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "is gestopt met typen"
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "Berichtgeschiedenis"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Kies een avatar"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "Verbinding maken..."
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Verbonden"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Verkeerd wachtwoord"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Fout"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Beheerder"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Lid"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Gebruiker"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Privégesprek beginnen"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Toestaan"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Afwijzen"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "Beheerder"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "Lid"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "Gebruiker"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Deelnemen aan groepsgesprek"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Privégesprek beginnen"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "Geen accounts actief"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Accounts beheren"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "Geen gesprekken actief"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Gesprek beginnen"
+#~ msgid "Add Chat"
+#~ msgstr "Gesprek beginnen"
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 01df2cc7..0df295f1 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
 "PO-Revision-Date: 2017-04-29 22:51+0000\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -59,7 +60,7 @@ msgstr "Senha"
 msgid "Join on startup"
 msgstr "Conectar-se ao inicializar"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Pesquisar"
 
@@ -69,7 +70,7 @@ msgid "Save"
 msgstr "Salvar"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "Pseudônimo local"
 
@@ -77,22 +78,29 @@ msgstr "Pseudônimo local"
 msgid "Accounts"
 msgstr "Contas"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "Nenhuma conta ativa"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Adicionar conta"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "Iniciar bate-papo"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "Juntar-se a uma conferência"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Configurações"
 
@@ -100,7 +108,7 @@ msgstr "Configurações"
 msgid "Quit"
 msgstr "Sair"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "Detalhes do contato"
 
@@ -112,12 +120,12 @@ msgstr "Não-criptografado"
 msgid "Preferences"
 msgstr "Preferências"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 #, fuzzy
 msgid "Send typing notifications"
 msgstr "Enviar notificações quando digitando e marcador de mensagens"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 #, fuzzy
 msgid "Send message marker"
 msgstr "Enviar notificações quando digitando e marcador de mensagens"
@@ -130,13 +138,55 @@ msgstr ""
 msgid "Convert smileys to emojis"
 msgstr "Converter smileys para emojis"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Juntar-se"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "Iniciar bate-papo"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "Próximo"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Juntar-se"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:39
+#, fuzzy
+msgid "Local Settings"
+msgstr "Configurações"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "Detalhes do contato"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -171,7 +221,7 @@ msgid "Who may discover real JIDs?"
 msgstr ""
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
+msgid "Password required to enter the room. Leave empty for none"
 msgstr ""
 
 #: src/ui/contact_details/muc_config_form_provider.vala:66
@@ -198,188 +248,189 @@ msgstr ""
 msgid "Maximum number of history messages returned by the room"
 msgstr ""
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
 msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr ""
-
-#: src/ui/contact_details/settings_provider.vala:43
-#, fuzzy
-msgid "Local Settings"
-msgstr "Configurações"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i min atrás"
 msgstr[1] "%i min atrás"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "Agora há pouco"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "está digitando..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "parou de digitar"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "está digitando..."
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "parou de digitar"
+#: src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr ""
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "Escolher avatar"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "Conectando..."
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "Senha errada"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "Erro"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr ""
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr ""
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr ""
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr ""
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "Iniciar conversa privada"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "Pedido de assinatura"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "Aceitar"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "Negar"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr ""
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr ""
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr ""
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Juntar-se a uma conferência"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Iniciar conversa privada"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "Nenhuma conta ativa"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "Gerenciar contas"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "Nenhuma conversa ativa"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "Adicionar bate-papo"
+#~ msgid "Add Chat"
+#~ msgstr "Adicionar bate-papo"
diff --git a/main/po/zh_Hans.po b/main/po/zh_Hans.po
index 56caeaee..1c01ffa3 100644
--- a/main/po/zh_Hans.po
+++ b/main/po/zh_Hans.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"POT-Creation-Date: 2017-10-23 00:48+0200\n"
 "PO-Revision-Date: 2017-06-01 10:32+0000\n"
 "Last-Translator: tonghuix <tonghuix@gmail.com>\n"
-"Language-Team: Chinese (Simplified) "
-"<https://hosted.weblate.org/projects/dino/translations/zh_Hans/>\n"
+"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
+"dino/translations/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,10 @@ msgstr ""
 "X-Generator: Weblate 2.15-dev\n"
 
 #: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
+#: src/ui/add_conversation/chat/dialog.vala:40
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Cancel"
 msgstr "取消"
 
@@ -63,7 +64,7 @@ msgstr "密码"
 msgid "Join on startup"
 msgstr "启动时加入"
 
-#: data/conversation_selector/view.ui:15
+#: data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "搜索"
 
@@ -73,7 +74,7 @@ msgid "Save"
 msgstr "保存"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:220
+#: data/manage_accounts/dialog.ui:196
 msgid "Local alias"
 msgstr "本地别名"
 
@@ -81,22 +82,29 @@ msgstr "本地别名"
 msgid "Accounts"
 msgstr "帐号"
 
-#: data/manage_accounts/dialog.ui:309
+#: data/manage_accounts/dialog.ui:251
+#, fuzzy
+msgid "No accounts configured"
+msgstr "没有激活的帐号"
+
+#: data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "添加新账号"
 
-#: data/menu_add.ui:6
+#: data/menu_add.ui:6 src/ui/application.vala:70
+#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:149
+#: data/menu_add.ui:12 src/ui/application.vala:41
+#: src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:151
 msgid "Join Conference"
 msgstr "加入群聊"
 
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:25
 #: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "设置"
 
@@ -104,7 +112,7 @@ msgstr "设置"
 msgid "Quit"
 msgstr "退出"
 
-#: data/menu_conversation.ui:6
+#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
 msgid "Contact Details"
 msgstr "联系人详情"
 
@@ -116,11 +124,11 @@ msgstr "未加密"
 msgid "Preferences"
 msgstr "选项"
 
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
 msgid "Send typing notifications"
 msgstr "发送打字通知"
 
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
 msgid "Send message marker"
 msgstr "发送消息标记"
 
@@ -132,13 +140,54 @@ msgstr "新消息到达时通知"
 msgid "Convert smileys to emojis"
 msgstr "将笑脸转换成 Emoji"
 
+#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "加入"
+
+#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#, fuzzy
+msgid "Start"
+msgstr "开始聊天"
+
 #: src/ui/add_conversation/conference/dialog.vala:45
 msgid "Next"
 msgstr "下一个"
 
-#: src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "加入"
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "通知"
+
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "本地设置"
+
+#: src/ui/contact_details/settings_provider.vala:74
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "开启"
+
+#: src/ui/contact_details/settings_provider.vala:76
+#: src/ui/contact_details/settings_provider.vala:114
+#: src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "关闭"
+
+#: src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "只有被提到时"
+
+#: src/ui/contact_details/settings_provider.vala:80
+#: src/ui/contact_details/settings_provider.vala:115
+#, fuzzy, c-format
+msgid "Default: %s"
+msgstr "默认"
+
+#: src/ui/contact_details/dialog.vala:37
+#, fuzzy
+msgid "Conference Details"
+msgstr "联系人详情"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Name of the room"
@@ -173,7 +222,8 @@ msgid "Who may discover real JIDs?"
 msgstr "谁可能发现真实 JID？"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:63
-msgid "Passwort required to enter the room. Leave empty for none"
+#, fuzzy
+msgid "Password required to enter the room. Leave empty for none"
 msgstr "进入房间要求使用密码。留空表示不需要密码"
 
 #: src/ui/contact_details/muc_config_form_provider.vala:66
@@ -200,186 +250,189 @@ msgstr "消息历史记录"
 msgid "Maximum number of history messages returned by the room"
 msgstr "返回的房间的历史消息的最大数目"
 
-#: src/ui/contact_details/muc_config_form_provider.vala:80
+#: src/ui/contact_details/muc_config_form_provider.vala:81
 msgid "Room Configuration"
 msgstr "房间配置"
 
-#: src/ui/contact_details/settings_provider.vala:21
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Default"
-msgstr "默认"
+#: src/ui/conversation_selector/chat_row.vala:30
+#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+msgid "Me"
+msgstr ""
 
-#: src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:41
-msgid "On"
-msgstr "开启"
-
-#: src/ui/contact_details/settings_provider.vala:23
-#: src/ui/contact_details/settings_provider.vala:42
-msgid "Off"
-msgstr "关闭"
-
-#: src/ui/contact_details/settings_provider.vala:34
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Notifications"
-msgstr "通知"
-
-#: src/ui/contact_details/settings_provider.vala:40
-msgid "Only when mentioned"
-msgstr "只有被提到时"
-
-#: src/ui/contact_details/settings_provider.vala:43
-msgid "Local Settings"
-msgstr "本地设置"
-
-#: src/ui/conversation_selector/conversation_row.vala:173
+#: src/ui/conversation_selector/conversation_row.vala:172
 #, no-c-format
 msgid "%b %d"
 msgstr "%_m 月 %_d 日"
 
-#: src/ui/conversation_selector/conversation_row.vala:177
+#: src/ui/conversation_selector/conversation_row.vala:176
 msgid "Yesterday"
 msgstr "昨天"
 
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/message_item.vala:110
+#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: src/ui/conversation_selector/conversation_row.vala:181
-#: src/ui/conversation_summary/message_item.vala:111
+#: src/ui/conversation_selector/conversation_row.vala:180
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:184
-#: src/ui/conversation_summary/message_item.vala:114
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i 分钟以前"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
-#: src/ui/conversation_summary/message_item.vala:116
+#: src/ui/conversation_selector/conversation_row.vala:185
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
 msgid "Just now"
 msgstr "刚刚"
 
-#: src/ui/conversation_summary/message_item.vala:98
+#: src/ui/conversation_summary/chat_state_populator.vala:58
+msgid "is typing..."
+msgstr "正在输入..."
+
+#: src/ui/conversation_summary/chat_state_populator.vala:60
+msgid "has stopped typing"
+msgstr "已经停止输入"
+
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:99
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:102
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%_m 月 %_d 日，%H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:103
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%_m 月 %_d 日，%l∶%M %p"
 
-#: src/ui/conversation_summary/message_item.vala:106
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%A，%H∶%M"
 
-#: src/ui/conversation_summary/message_item.vala:107
+#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%A，%l∶%M %p"
 
-#: src/ui/conversation_summary/view.vala:120
-msgid "is typing..."
-msgstr "正在输入..."
-
-#: src/ui/conversation_summary/view.vala:122
-msgid "has stopped typing"
-msgstr "已经停止输入"
+#: src/ui/conversation_summary/message_textview.vala:33
+#, fuzzy
+msgid "Message too long"
+msgstr "消息历史记录"
 
 #: src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "添加帐号"
 
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:150
 msgid "Select avatar"
 msgstr "选择头像"
 
-#: src/ui/manage_accounts/dialog.vala:153
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select"
 msgstr "选择"
 
-#: src/ui/manage_accounts/dialog.vala:252
-msgid "Connecting..."
+#: src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:162
+msgid "All files"
+msgstr ""
+
+#: src/ui/manage_accounts/dialog.vala:224
+#, fuzzy
+msgid "Connecting…"
 msgstr "连接中..."
 
-#: src/ui/manage_accounts/dialog.vala:254
+#: src/ui/manage_accounts/dialog.vala:226
 msgid "Connected"
 msgstr "已连接"
 
-#: src/ui/manage_accounts/dialog.vala:256
+#: src/ui/manage_accounts/dialog.vala:228
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/ui/manage_accounts/dialog.vala:279
+#: src/ui/manage_accounts/dialog.vala:237
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: src/ui/manage_accounts/dialog.vala:282
-#: src/ui/manage_accounts/dialog.vala:284
+#: src/ui/manage_accounts/dialog.vala:240
+#: src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
 msgstr "错误"
 
-#: src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "所有者"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "管理员"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "成员"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "用户"
-
-#: src/ui/occupant_menu/view.vala:48
-msgid "Start private conversation"
-msgstr "启动私密会话"
-
-#: src/ui/notifications.vala:70
+#: src/ui/notifications.vala:103
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: src/ui/notifications.vala:72
+#: src/ui/notifications.vala:107
 msgid "Accept"
 msgstr "接受"
 
-#: src/ui/notifications.vala:85
+#: src/ui/notifications.vala:108
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/ui/unified_window.vala:139
+#: src/ui/occupant_menu/list.vala:107
+msgid "Owner"
+msgstr "所有者"
+
+#: src/ui/occupant_menu/list.vala:109
+msgid "Admin"
+msgstr "管理员"
+
+#: src/ui/occupant_menu/list.vala:111
+msgid "Member"
+msgstr "成员"
+
+#: src/ui/occupant_menu/list.vala:113
+msgid "User"
+msgstr "用户"
+
+#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: src/ui/occupant_menu/view.vala:34
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "加入群聊"
+
+#: src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "启动私密会话"
+
+#: src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: src/ui/unified_window.vala:141
 msgid "No accounts active"
 msgstr "没有激活的帐号"
 
-#: src/ui/unified_window.vala:140
+#: src/ui/unified_window.vala:142
 msgid "Manage accounts"
 msgstr "管理帐号"
 
-#: src/ui/unified_window.vala:147
+#: src/ui/unified_window.vala:149
 msgid "No conversation active"
 msgstr "没有激活的会话"
 
-#: src/ui/unified_window.vala:148
-msgid "Add Chat"
-msgstr "添加聊天"
+#~ msgid "Add Chat"
+#~ msgstr "添加聊天"