Update translations

14 files changed, 2379 insertions, 1917 deletions

diff --git a/main/data/contact_details_dialog.ui b/main/data/contact_details_dialog.ui
index 0903b260..8fa62398 100644
--- a/main/data/contact_details_dialog.ui
+++ b/main/data/contact_details_dialog.ui
@@ -4,7 +4,7 @@
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="title" translatable="yes">Conversation Details</property>
+                <property name="title">Conversation Details</property>
                 <property name="show_close_button">True</property>
                 <property name="visible">True</property>
             </object>
diff --git a/main/po/de.po b/main/po/de.po
index 3f264a40..6c5814e9 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-11-21 23:41+0000\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-11-29 16:25+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
 "de/>\n"
@@ -14,467 +14,503 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Annehmen"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr "Account %s löschen?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr "Löschen"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Kontaktbild auswählen"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Verbinden…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Passwort falsch"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Ich"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "vor %i min"
 msgstr[1] "vor %i min"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Gerade eben"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Konferenz beitreten"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Beitreten"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Weiter"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Starten"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr "Beitreten…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Raum erfordert Passwort"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr "Beitreten oder erstellen der Konferenz verboten"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "Raum existiert nicht"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr "Raum erzeugen verboten"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "Raum nur für Mittglieder"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Wähle einen anderen Spitznamen"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "Zu viele Nutzer im Raum"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Keine Konten aktiv"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Konten verwalten"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Keine Unterhaltung aktiv"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
-msgstr "tippt gerade..."
+msgstr "tippt gerade…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "hat aufgehört zu tippen"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Nachricht zu lang"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d. %b, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d. %b, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Eigentümer"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Administrator"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Gast"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Zur Konferenz einladen"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Private Unterhaltung beginnen"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Hinauswerfen"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Konferenzdetails"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Kontaktdetails"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Name des Raums"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Beschreibung des Raums"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Dauerhaft"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr ""
 "Der Raum bleibt erhalten, nachdem der letzte Benutzer ihn verlassen hat"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Öffentlich sichtbar"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Nutzer können das Thema ändern"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Echte JIDs finden"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "Wer kann echte JIDs sehen?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Passwort"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
-#, fuzzy
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
-msgstr "Passwort zum Betreten des Raums. Leer bedeutet keins"
+msgstr "Passwort zum Betreten des Raums, falls gesetzt"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Moderiert"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "Nur Nutzer mit Stimme können Nachrichten senden"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Ausschließlich Mitglieder"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Nur Mitglieder dürfen den Raum betreten"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Chatverlauf"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Anzahl der für diesen Raum gespeicherten Nachrichten"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Raum Konfiguration"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Blockieren"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "Kommunikation und Statusaktualisierungen sind in beide Richtungen blockiert"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Tippbenachrichtigungen senden"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Lesebestätigung senden"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "Aus"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Standard: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Smileys zu Emojis umwandeln"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Lokaler Alias"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "Keine Konten konfiguriert"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Konto hinzufügen"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Unverschlüsselt"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Suchen"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Online-Status erfragen"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Online-Status erfragen"
 
 #~ msgid "Join on startup"
 #~ msgstr "Beim Start beitreten"
diff --git a/main/po/dino.pot b/main/po/dino.pot
index da42567d..3249ce95 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-11-24 01:10+0100\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\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"
@@ -18,461 +18,495 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr ""
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr ""
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr ""
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr ""
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr ""
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr ""
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr ""
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr ""
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr ""
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr ""
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr ""
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr ""
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr ""
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr ""
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr ""
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr ""
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr ""
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr ""
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr ""
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr ""
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr ""
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
 msgstr ""
diff --git a/main/po/en.po b/main/po/en.po
index ebdd748c..1b28e908 100644
--- a/main/po/en.po
+++ b/main/po/en.po
@@ -2,467 +2,501 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr ""
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr ""
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr ""
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr ""
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr ""
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr ""
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr ""
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr ""
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr ""
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr ""
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr ""
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr ""
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr ""
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr ""
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr ""
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr ""
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr ""
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr ""
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr ""
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr ""
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr ""
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
 msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
index 5297a2bd..afda92e2 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\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/"
@@ -19,464 +19,501 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.15-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Abona peto"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akcepti"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Elekti profilbildon"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Elekti"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Konektita"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Malkonektita"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Malĝusta pasvorto"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Eraro"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Aldoni Konton"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Ĵus"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Aliĝi al Kunveno"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Aliĝi"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Konservi"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Sekva"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Ekbabili"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Neniuj aktivaj kontoj"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Administri kontojn"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Neniu aktiva interparolo"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr "tajpas…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "ĉesis tajpi"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Posedanto"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Administranto"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Ano"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Uzanto"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Komenci privatan interparolon"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Kontaktaj Detaloj"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Nomo de la ĉambro"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Priskribo de la ĉambro"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Daŭra"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "La ĉambro daŭros post eliro de la lasta ĉeestinto"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Publike serĉebla"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Ĉeestantoj rajtas ŝanĝi temon"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Eltrovi verajn JID-ojn"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "Kiu rajtas eltrovi verajn JID-ojn?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Kontrolata"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Nur anoj"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Nur anoj rajtas eniri la ĉambron"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Mesaĝa historio"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Maksimuma nombro da historiaj mesaĝoj donotaj de la ĉambro"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Ĉambraj Agordoj"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Agordoj"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Sciigi pri tajpado"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Sendi mesaĝmarkilon"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Sciigoj"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "For"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Preferoj"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Sciigi pri envenaj mesaĝoj"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Grafikigi tekstajn mienetojn"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Loka kaŝnomo"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Aldoni konton"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Neĉifrita"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Serĉi"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Kaŝnomo"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Peti sciigojn pri ĉeesto"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Peti sciigojn pri ĉeesto"
 
 #~ msgid "Join on startup"
 #~ msgstr "Aliĝi je lanĉo"
diff --git a/main/po/es.po b/main/po/es.po
index ec4a08d3..b59c5d69 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-11-18 07:21+0000\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-11-30 21:49+0000\n"
 "Last-Translator: sergio <srg.dev@posteo.net>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
 "translations/es/>\n"
@@ -19,468 +19,504 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Solicitud de suscripción"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr "¿Eliminar cuenta %s?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Seleccionar imagen de perfil"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr "Todos los ficheros"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Error"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Añadir Cuenta"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Yo"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Ahora"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Unirse a Conversación en grupo"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Unirse"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Añadir"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Iniciar Conversación"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Iniciar Conversación"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
-msgstr "Uniéndose..."
+msgstr "Uniéndose…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Contraseña requerida para entrar en la conversación en grupo"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 "Tu entrada ha sido prohibida o no puedes crear la conversación en grupo"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "La conversación en grupo no existe"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr "No está permitido crear la conversación en grupo"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "La conversación es solo para miembros"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Elige un alias diferente"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "La conversación tiene demasiados ocupantes"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "No hay cuentas activas"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Gestionar cuentas"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "No hay conversaciones activa"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
-msgstr "está escribiendo..."
+msgstr "está escribiendo…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "ha dejado de escribir"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Mensaje demasiado largo"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Administrador"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Usuario"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Invitar a Conversación en grupo"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Iniciar conversación privada"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Expulsar"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Detalles de la Conversación"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Detalles del contacto"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Nombre de la conversación en grupo"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Descripción de la conversación en grupo"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Conversación permanente"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "La conversación en grupo no se eliminará aunque no haya participantes"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Conversación pública"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Los ocupantes pueden cambiar el asunto de la conversación"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Descubrir JIDs reales"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "¿Quién puede ver los JIDs reales?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
-#, fuzzy
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr ""
 "Contraseña requerida para entrar en la conversación en grupo. Dejar vacío "
 "para ninguna"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Conversación moderada"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "Solo los participantes con voz pueden enviar mensajes"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Conversación privada solo para miembros"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Solo los miembros pueden entrar en la conversación en grupo"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Histórico de mensajes"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Número máximo de mensajes que se almacenan en servidor"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Configuración de la conversación en grupo"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
-msgstr "Las comunicaciones y las actualizaciones de presencia están bloqueadas"
+msgstr "Las comunicaciones y las actualizaciones de presencia serán bloqueadas"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Enviar notificaciones cuando escribes"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Enviar confirmación al recibir y al leer los mensajes"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Local Settings"
 msgstr "Ajustes locales"
 
-#: ../src/ui/contact_details/settings_provider.vala:74
-#: ../src/ui/contact_details/settings_provider.vala:114
-#: ../src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "No"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Por defecto: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar cuando llega un nuevo mensaje"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Convertir smileys en emojis"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Alias local"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "No hay cuentas activas"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Añadir una cuenta"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Sin cifrar"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Salir"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Solicitar actualizaciones de presencia"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Solicitar actualizaciones de presencia"
 
 #~ msgid "This is an app-notification. Click the button to dismiss"
 #~ msgstr ""
diff --git a/main/po/eu.po b/main/po/eu.po
index 54c93994..72afb5d1 100644
--- a/main/po/eu.po
+++ b/main/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
 "PO-Revision-Date: 2017-11-23 00:31+0000\n"
 "Last-Translator: Aitor Beriain <beriain@bitmessage.ch>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
@@ -19,466 +19,503 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Harpidetzaren eskaera"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Ukatu"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr "%s kontua kendu?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr "Kendu"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Irudia hautatu"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Konektatzen…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Ez konektatuta"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Pasahitz okerra"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Akatsa"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Kontua gehitu"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Ni"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Atzo"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Orain"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Konferentziara batu"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Batu"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Gorde"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Berriketa hasi"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Hasi"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr "Batzen..."
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Pasahitza behar da gelara sartzeko"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "Gela ez da existitzen"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr "Ez duzu gela sortzeko baimenik"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "Gela kideentzat da soilik"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Ezizen ezberdin bat hautatu"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "Gelak kide gehiegi ditu"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Ez dago kontu aktiborik"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Kontuak kudeatu"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Ez dago solasaldi aktiborik"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr "idazten ari da..."
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "idazteari utzi dio"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Mezu luzeegia"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Administratzailea"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Kidea"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Gonbidatu"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Konferentziara gonbidatu"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Solasaldi pribatua hasi"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Kanporatu"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Konferentziaren xehetasunak"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Kontaktuaren xehetasunak"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Gelaren izena"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Gelaren deskribapena"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Iraunkorra"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "Gelak iraun egingo du azken okupatzailea irten ondoren"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Publikoki bilagarria"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Okupatzaileek gaia alda dezakete"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Egiazko JIDak ikusi"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "Nork ikus ditzake egiazko JIDak?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 #, fuzzy
 msgid "Password required for room entry, if any"
 msgstr ""
 "Gelan sartzeko beharrezko pasahitza. Utzi zuriz pasahitzik ez ezartzeko"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Moderatua"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 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:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Kideak soilik"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Kideak soilik sar daitezke gelara"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Mezuen historia"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Gelak itzuliko dituen gehienezko historiako mezuak"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Gelaren konfigurazioa"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Blokeatu"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Idazte jakinarazpenak bidali"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Mezu marka bidali"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "Itzalita"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Lehenetsia: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Mezu berri bat heltzerakoan jakinarazi"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Irrifartxoak emotikono bihurtu"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Kontuak"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Bertako ezizena"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "Ez dago konfiguratutako konturik"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Kontu bat gehitu"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Enkriptatu gabe"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Irten"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Kontuak"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Ezizena"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Ezizena"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Presentzia eguneraketak eskatu"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Presentzia eguneraketak eskatu"
 
 #~ msgid "Join on startup"
 #~ msgstr "Hasieran batu"
diff --git a/main/po/fr.po b/main/po/fr.po
index d2332634..bbb49e86 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-07-16 08:49+0000\n"
-"Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-12-22 20:55+0000\n"
+"Last-Translator: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
 "fr/>\n"
 "Language: fr\n"
@@ -17,466 +17,503 @@ msgstr ""
 "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-dev\n"
+"X-Generator: Weblate 2.19-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Demande d’abonnement"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
-msgstr ""
+msgstr "Supprimer le compte %s ?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
-msgstr ""
+msgstr "Supprimer"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Choisir un avatar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Choisir"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
-msgstr ""
+msgstr "Images"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
-msgstr ""
+msgstr "Tous les fichiers"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
-msgstr ""
+msgstr "Connexion…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
-msgstr ""
+msgstr "Moi"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Hier"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hh%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "À l’instant"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Rejoindre une conférence"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Rejoindre"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Sauver"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Suivant"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
-msgstr ""
+msgstr "Démarrer"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
-msgstr ""
+msgstr "Connexion au salon…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
-msgstr ""
+msgstr "Mot de passe nécessaire pour rejoindre ce salon"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
-msgstr ""
+msgstr "Vous êtes bannis pour la création ou connexion à ce salon"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
-msgstr ""
+msgstr "Ce salon n’existe pas"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
-msgstr ""
+msgstr "Création de salon interdite"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
-msgstr ""
+msgstr "Salon réservé aux membres"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
-msgstr ""
+msgstr "Choisissez un autre pseudo"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
-msgstr ""
+msgstr "Trop de participants dans ce salon"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Aucun compte actif"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Gérer les comptes"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Aucune discussion en cours"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr "est en train d’écrire…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "a arrêté d’écrire"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
+msgstr "Message trop long"
+
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %Hh%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %Hh%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %Hh%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Membre"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
-msgstr ""
+msgstr "Inviter"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
-msgstr ""
+msgstr "Inviter dans un salon"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Commencer une discussion privée"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
-msgstr ""
+msgstr "Éjecter"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
-msgstr ""
+msgstr "Informations du salon"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Informations du contact"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Nom du salon"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Description du salon"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Persistant"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "Ce salon persistera après le départ du dernier occupant"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Visible publiquement"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Les occupants peuvent changer le sujet"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Découverte des vrais JID"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "Qui peut découvrir les vrais JID ?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
-msgstr ""
+msgstr "Mot de passe pour rejoindre le salon, vide pour aucun"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Modéré"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "Seuls les membres ayant voix peu"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Seulement les membres"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Seuls les membres peuvent accéder au salon"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Historique des messages"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Nombre de messages d’historique retourné par le salon"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Configuration du salon"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
-msgstr ""
+msgstr "Bloquer"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
-msgstr ""
+msgstr "Tous les échanges de messages et de statuts sont bloqués"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Envoyer les notifications de frappe"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Envoyer les marqueurs de message"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "Désactivé"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
-msgstr ""
+msgstr "Par défaut : %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifier l’arrivée de nouveaux messages"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
-msgstr "Convertir les smileys en émoticônes"
+msgstr "Convertir les smileys en emojis"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Alias local"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
-msgstr ""
+msgstr "Aucun compte configuré"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Ajouter un compte"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Non-chiffré"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Compte"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Pseudo"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Demander les mises à jour de la présence"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Demander les mises à jour de la présence"
 
 #~ msgid "Join on startup"
 #~ msgstr "Rejoindre au démarrage"
diff --git a/main/po/it.po b/main/po/it.po
index f1a9cd74..21e9ae1b 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-11-18 12:47+0000\n"
-"Last-Translator: Valerio Baldisserotto <svalo@libersoft.it>\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-12-11 00:48+0000\n"
+"Last-Translator: M <d.pitrolo@gmx.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
 "translations/it/>\n"
 "Language: it\n"
@@ -19,470 +19,503 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
-msgstr "Richiesta di sottoscrizione"
+msgstr "Richiesta di abbonamento"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rifiuta"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
-msgstr "Rimuovere l' account %s?"
+msgstr "Rimuovere il conto %s?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
-msgstr "Rimuovi"
+msgstr "Cancella"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
-msgstr "Seleziona avatar"
+msgstr "Scegli un avatar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
-msgstr "Seleziona"
+msgstr "Scegli"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
-msgstr "Tutti i files"
+msgstr "Tutti i documenti"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Connessione…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
-msgstr "Password errata"
+msgstr "Parola d'ordine sbagliata"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
-msgstr "Aggiungi Account"
+msgstr "Aggiungi un conto"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Io"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Adesso"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Entra in una conferenza"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Entra"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Avanti"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Inizia una conversazione"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Inizia"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
-msgstr ""
+msgstr "Accesso in corso…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Una password è richiesta per entrare nella stanza"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
-msgstr ""
+msgstr "Ti è proibito entrare o creare la conferenza"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "La stanza non esiste"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
-#, fuzzy
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
-msgstr "Non sei abilitata/o a creare stanze"
+msgstr "Non sei abilitato a creare la stanza"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "La stanza è solo per membri"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Scegli un soprannome differente"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
-#, fuzzy
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "La stanza ha troppi occupanti"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Nessun account attivo"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Gestisci accounts"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Nessuna conversazione attiva"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
-msgstr "sta scrivendo..."
+msgstr "sta scrivendo…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "ha smesso di scrivere"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Messaggio troppo lungo"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Amministratore"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Utente"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Invita"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Invita alla conferenza"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Inizia una conversazione privata"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Espelli"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Dettagli della conferenza"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Dettagli del contatto"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Nome della stanza"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Descrizione della stanza"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Persistente"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "La stanza continuerà ad esistere dopo l'uscita dell'ultimo occupante"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Ricercabile pubblicamente"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Gli occupanti possono cambiare il soggetto"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Scopri i veri JIDs"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "Chi può scoprire i veri JIDs?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Password"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
-#, fuzzy
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
-msgstr ""
-"Password richiesta per entrare nella stanza. Lascia vuoto per non impostarla"
+msgstr "Password richiesta per entrare nella stanza, se impostata"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Moderata"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "Solo gli occupanti con voce possono mandare messaggi"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Solo per membri"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Solo i membri possono entrare nella stanza"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Cronologia dei messaggi"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Numero massimo di messaggi in cronologia restituiti dalla stanza"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Blocca"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "La comunicazione e gli aggiornamenti di stato sono bloccati in entrambe le "
 "direzioni"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Invia notifiche di digitazione"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Invia lo stato del messaggio"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Local Settings"
-msgstr "Impostazioni Locali"
+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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "No"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Default: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifica quando arriva un nuovo messaggio"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
-msgstr "Converte smileys in emojis"
+msgstr "Trasforma smileys in emojis"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
-msgstr "Accounts"
+msgstr "Conti"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Alias locale"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "Nessun account configurato"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Aggiungi un account"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Non cifrato"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Esci"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Cerca"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Account"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Soprannome"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Richiedi gli aggiornamenti di stato"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Richiedi gli aggiornamenti di stato"
 
 #~ msgid "This is an app-notification. Click the button to dismiss"
 #~ msgstr "Questa è una notifica dell'app. Clicca il bottone per chiudere"
diff --git a/main/po/lb.po b/main/po/lb.po
index 906eb36b..15b235fc 100644
--- a/main/po/lb.po
+++ b/main/po/lb.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Luxembourgish (Dino)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-11-18 16:43+0000\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-11-27 15:43+0000\n"
 "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
 "translations/lb/>\n"
@@ -14,467 +14,501 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Abonnement Ufro"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akzeptéieren"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Verweigeren"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr "Konto %s läschen?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr "Läschen"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Avatar auswielen"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Auswielen"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Biller"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr "All Dateien"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Verbannen…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Verbonnen"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Getrennt"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Falsch Passwuert"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Feeler"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Account bäisetzen"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Ech"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Gëschter"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i Minutt hier"
 msgstr[1] "%i Minutten hier"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Just elo"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Konferenz bäitrieden"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Bäitrieden"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Bäisetzen"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Späicheren"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Nächst"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Start"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr "Bäitrieden…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Passwuert gëtt gebraucht fir de Raum ze betrieden"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr "Gebannt vum bäitrieden an erstelle vu Konferenzen"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "Raum existéiert net"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr "Net erlaabt ee Raum ze erstellen"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "Raum ass nëmme fir Memberen"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Wiel een anere Spëtznumm"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "De Raum huet ze vill Benotzer"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Keng Kontoen aktiv"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Kontoe managen"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Keng Conversatiounen aktiv"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr "tippt grad…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "huet opgehalen ze tippen"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Noriicht ze laang"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H:%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l:%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H:%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l:%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Besëtzer"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Member"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Benotzer"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Alueden"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Invitéieren an Konferenz"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Privat Conversatioun starten"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Erausgeheien"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Konferenz Detailer"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Kontaktdetailer"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Numm vum Raum"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Beschreiwung vum Raum"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Dauerhaft"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "De Raum bleift bestoen, nodeems de leschte Benotzer erausgaangen ass"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Ëffentlech siichtbar"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Benotzer däerfe Sujet änneren"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Echt JIDs gesinn"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "Ween däerf echt JIDs gesinn?"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Passwuert"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
-#, fuzzy
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
-msgstr ""
-"Passwuert gëtt gebraucht fir de Raum ze betrieden. Eidel loosse fir kee "
-"Passwuert"
+msgstr "Passwuert fir de Raum ze betrieden, wann een gebraucht gëtt"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Moderéiert"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "Nëmme Benotzer mat Stemm däerfe Messagë schécken"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Nëmme fir Memberen"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Nëmme Memberen däerfen de Raum betrieden"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Messagen Historique"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Maximal Unzuel vum ale Messagen, déi vum Raum geschéckt ginn"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Raum Astellungen"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Astellungen"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Blockéieren"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Kommunikatioun a Status Updates sinn an all Richtung blockéiert"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Tipp-Notifikatioune schécken"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Message Marker verschécken"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Notifikatiounen"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Local Settings"
 msgstr "Lokal Astellungen"
 
-#: ../src/ui/contact_details/settings_provider.vala:74
-#: ../src/ui/contact_details/settings_provider.vala:114
-#: ../src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:116
 msgid "On"
 msgstr "Un"
 
-#: ../src/ui/contact_details/settings_provider.vala:76
-#: ../src/ui/contact_details/settings_provider.vala:114
-#: ../src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "Aus"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:78
 msgid "Only when mentioned"
 msgstr "Nëmme wann erwäänt"
 
-#: ../src/ui/contact_details/settings_provider.vala:80
-#: ../src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Standard: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Astellungen"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Benoriichtege wann een neie Message ukënnt"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Smileyen an Emojien konvertéieren"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Kontoen"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Lokalen Pseudonym"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "Keng Kontoe konfiguréiert"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Ee Konto bäisetzen"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Onverschlësselt"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Zoumaachen"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Sichen"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Spëtznumm"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Pseudonym"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Presenz Updaten ufroen"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Presenz Updaten ufroen"
 
 #~ msgid "This is an app-notification. Click the button to dismiss"
 #~ msgstr ""
diff --git a/main/po/nb.po b/main/po/nb.po
index fa8222fe..51ac8a76 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-11-18 00:19+0000\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-11-25 05:49+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
 "translations/nb/>\n"
@@ -19,467 +19,503 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Godta"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr "Fjern konto %s?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Velg avatar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Velg"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Kobler til…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Feil passord"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Meg"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Akkurat nå"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Ta del i konferanse"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Ta del"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Legg til"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Neste"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Start sludring"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Start"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr "Tar del…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Passord kreves for å ta del i rommet"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr "Bannlyst fra å ta del i eller å opprette konferanser"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "Rommet finnes ikke"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr "Ikke tillatt å opprette rom"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "Rommet er kun for medlemmer"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Velg et annet kallenavn"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "Rommet har for mange deltagere"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Ingen kontoer aktive"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Behandle kontoer"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Ingen kontoer aktive"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 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:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "har tatt pause i skrivinga"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Meldingen er for land"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Admin"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Bruker"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Inviter til konferanse"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Start privat samtale"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Kast ut"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Konferansedetaljer"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Kontaktdetaljer"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Rommets navn"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Beskrivelse av rommet"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Vedvarende"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "Rommet vil vedvare etter at siste deltager forlater"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Offentlig søkbart"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Deltagere kan endre emne"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Oppdag ekte JID-er"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 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:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Passord"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
-#, fuzzy
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr "Passord kreves for å ta del i rommet. La stå tomt for inget"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Moderert"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 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:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Kun for medlemmer"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Kun medlemmer har adgang til rommet"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Meldingshistorikk"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Maksimalt antall meldinger med historikk som skal svares av rommet"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Rom-oppsett"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Blokker"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Kommunikasjon og statusoppdateringer i begge retninger er blokkert"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Send skrivevarsling"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Send meldingsmarkør"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Merknader"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "Av"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Forvalg: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Varsle ved mottak av ny melding"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Konverter smilefjes til emoji-er"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Lokalt alias"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "Ingen kontoer satt opp"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Legg til en konto"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Søk"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Forespør tilstedeværelsesoppdateringer"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Forespør tilstedeværelsesoppdateringer"
 
 #~ msgid "This is an app-notification. Click the button to dismiss"
 #~ msgstr "Dette er en merknad i programmet. Klikk på knappen for å avvise"
diff --git a/main/po/nl.po b/main/po/nl.po
index fa2fe816..3281b16b 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
-"PO-Revision-Date: 2017-11-17 20:58+0000\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
+"PO-Revision-Date: 2017-11-26 12:45+0000\n"
 "Last-Translator: Nathan Follens <nathan@email.is>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
 "nl/>\n"
@@ -19,468 +19,502 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Afwijzen"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr "Account %s verwijderen?"
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Kies een avatar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Selecteren"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr "Verbinding maken…"
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Verkeerd wachtwoord"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Fout"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr "Ik"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Zojuist"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Deelnemen"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Gesprek beginnen"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr "Beginnen"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr "Deelnemen…"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr "Wachtwoord voor groepsgesprek vereist"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr "Deelnemen aan of aanmaken van groepsgesprekken verboden"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr "Groepsgesprek bestaat niet"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr "Aanmaken van groepsgesprek niet toegestaan"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr "Groepsgesprek is alleen-leden"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr "Kies een andere bijnaam"
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Geen accounts actief"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Accounts beheren"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Geen gesprekken actief"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
-msgstr "is aan het typen..."
+msgstr "is aan het typen…"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "is gestopt met typen"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr "Bericht te lang"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H:%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "Beheerder"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "Lid"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr "Uitnodigen in groepsgesprek"
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Privégesprek beginnen"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr "Schoppen"
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr "Groepsgespreksgegevens"
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Contactgegevens"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "Naam van groepsgesprek"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "Beschrijving van groepsgesprek"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "Blijvend"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr ""
 "Het groepsgesprek blijft bestaan wanneer de laatste deelnemer het verlaat"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "Publiek vindbaar"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "Deelnemers kunnen onderwerp aanpassen"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "Zichtbaarheid van JID's"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 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:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
-#, fuzzy
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
-msgstr ""
-"Wachtwoord vereist om deel te nemen aan het groepsgesprek. Laat dit leeg als "
-"je geen wachtwoord wil"
+msgstr "Wachtwoord voor groepsgesprek, indien nodig"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "Gemodereerd"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "Enkel deelnemers met stem mogen berichten sturen"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "Enkel leden"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "Enkel leden mogen deelnemen aan het groepsgesprek"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "Berichtgeschiedenis"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "Maximaal aantal berichten uit geschiedenis dat groepsgesprek weergeeft"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "Gespreksconfiguratie"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Aan-het-typen-meldingen sturen"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "Berichtmarkers sturen"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "Meldingen"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "Uit"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr "Standaard: %s"
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Melding tonen bij nieuw bericht"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Smileys omzetten naar emoji's"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Lokale alias"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr "Geen accounts ingesteld"
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Account toevoegen"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Onversleuteld"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Account"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Schermnaam"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Alias"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Vraag om aanwezigheidsupdates"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Vraag om aanwezigheidsupdates"
 
 #~ msgid "This is an app-notification. Click the button to dismiss"
 #~ msgstr "Dit is een melding. Klik om te sluiten"
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 204db05e..4ecbd245 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-11-24 01:10+0100\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\n"
 "PO-Revision-Date: 2017-04-29 22:51+0000\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -15,464 +15,501 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "Pedido de assinatura"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Negar"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "Escolher avatar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "Senha errada"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, 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:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "Agora há pouco"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "Juntar-se a uma conferência"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "Juntar-se"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "Próximo"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "Iniciar bate-papo"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "Nenhuma conta ativa"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "Gerenciar contas"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "Nenhuma conversa ativa"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr "está digitando..."
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "parou de digitar"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr ""
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "Iniciar conversa privada"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Detalhes do contato"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "Senha"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "Configurações"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Converter smileys para emojis"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "Pseudônimo local"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "Adicionar conta"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "Não-criptografado"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "Sair"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "Conta"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "Pseudônimo"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Pedir atualizações sobre presença"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "Pedir atualizações sobre presença"
 
 #~ msgid "Join on startup"
 #~ msgstr "Conectar-se ao inicializar"
diff --git a/main/po/zh_Hans.po b/main/po/zh_Hans.po
index ab4611af..76fe594c 100644
--- a/main/po/zh_Hans.po
+++ b/main/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-24 01:10+0100\n"
+"POT-Creation-Date: 2017-12-31 22:08+0100\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/"
@@ -19,463 +19,500 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.15-dev\n"
 
-#: ../src/ui/notifications.vala:105
+#: main/src/ui/notifications.vala:77
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: ../src/ui/notifications.vala:111
+#: main/src/ui/notifications.vala:83
+#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "接受"
 
-#: ../src/ui/notifications.vala:112
+#: main/src/ui/notifications.vala:84
+#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../src/ui/manage_accounts/dialog.vala:125
+#: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:128
+#: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:153
+#: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
 msgstr "选择头像"
 
-#: ../src/ui/manage_accounts/dialog.vala:154
+#: main/src/ui/manage_accounts/dialog.vala:154
 msgid "Select"
 msgstr "选择"
 
-#: ../src/ui/manage_accounts/dialog.vala:154 ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:15
-#: ../src/ui/add_conversation/select_contact_dialog.vala:40
-#: ../data/add_conversation/add_groupchat_dialog.ui:11
-#: ../data/add_conversation/add_contact_dialog.ui:11
+#: main/src/ui/manage_accounts/dialog.vala:154 main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/select_contact_dialog.vala:40
+#: main/data/add_conversation/add_groupchat_dialog.ui:11
+#: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/ui/manage_accounts/dialog.vala:162
+#: main/src/ui/manage_accounts/dialog.vala:162
 msgid "Images"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:165
+#: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:227
+#: main/src/ui/manage_accounts/dialog.vala:227
 msgid "Connecting…"
 msgstr ""
 
-#: ../src/ui/manage_accounts/dialog.vala:229
+#: main/src/ui/manage_accounts/dialog.vala:229
 msgid "Connected"
 msgstr "已连接"
 
-#: ../src/ui/manage_accounts/dialog.vala:231
+#: main/src/ui/manage_accounts/dialog.vala:231
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../src/ui/manage_accounts/dialog.vala:240
+#: main/src/ui/manage_accounts/dialog.vala:240
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: ../src/ui/manage_accounts/dialog.vala:243
-#: ../src/ui/manage_accounts/dialog.vala:245
+#: main/src/ui/manage_accounts/dialog.vala:243
+#: main/src/ui/manage_accounts/dialog.vala:245
 msgid "Error"
 msgstr "错误"
 
-#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+#: main/src/ui/manage_accounts/add_account_dialog.vala:21
 msgid "Add Account"
 msgstr "添加帐号"
 
-#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
-#: ../src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: main/src/ui/conversation_selector/chat_row.vala:30
 msgid "Me"
 msgstr ""
 
-#: ../src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_selector/conversation_row.vala:169
+#: main/src/ui/conversation_summary/date_separator_populator.vala:102
 #, no-c-format
 msgid "%b %d"
 msgstr "%_m 月 %_d 日"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_selector/conversation_row.vala:173
+#: main/src/ui/conversation_summary/date_separator_populator.vala:93
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:176
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:176
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:177
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:155
+#: main/src/ui/conversation_selector/conversation_row.vala:177
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:180
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:159
+#: main/src/ui/conversation_selector/conversation_row.vala:180
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i 分钟以前"
 
-#: ../src/ui/conversation_selector/conversation_row.vala:182
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:182
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:204
 msgid "Just now"
 msgstr "刚刚"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:26
-#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/unified_window.vala:176 main/data/menu_add.ui:12
 msgid "Join Conference"
 msgstr "加入群聊"
 
-#: ../src/ui/application.vala:41
-#: ../src/ui/add_conversation/add_conference_dialog.vala:62
-#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/application.vala:43
+#: main/src/ui/add_conversation/add_conference_dialog.vala:62
+#: main/src/ui/add_conversation/conference_details_fragment.vala:133
 msgid "Join"
 msgstr "加入"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
-#: ../data/add_conversation/add_contact_dialog.ui:23
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "添加"
 
-#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
-#: ../data/manage_accounts/add_account_dialog.ui:21
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: main/data/manage_accounts/add_account_dialog.ui:21
 msgid "Save"
 msgstr "保存"
 
-#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+#: main/src/ui/add_conversation/add_conference_dialog.vala:47
 msgid "Next"
 msgstr "下一个"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:84
-#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+#: main/src/ui/add_conversation/select_contact_dialog.vala:84
+#: main/src/ui/unified_window.vala:175 main/data/menu_add.ui:6
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+#: main/src/ui/add_conversation/select_contact_dialog.vala:85
 msgid "Start"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+#: main/src/ui/add_conversation/conference_details_fragment.vala:105
 msgid "Joining…"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:152
 msgid "Choose a different nick"
 msgstr ""
 
-#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:154
 msgid "Too many occupants in room"
 msgstr ""
 
-#: ../src/ui/unified_window.vala:137
+#: main/src/ui/unified_window.vala:166
 msgid "No active accounts"
 msgstr "没有激活的帐号"
 
-#: ../src/ui/unified_window.vala:138
+#: main/src/ui/unified_window.vala:167
 msgid "Manage accounts"
 msgstr "管理帐号"
 
-#: ../src/ui/unified_window.vala:145
+#: main/src/ui/unified_window.vala:174
 msgid "No active conversations"
 msgstr "没有激活的会话"
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+#: main/src/ui/conversation_summary/date_separator_populator.vala:87
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_summary/date_separator_populator.vala:100
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_summary/chat_state_populator.vala:57
 msgid "is typing…"
 msgstr "正在输入..."
 
-#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+#: main/src/ui/conversation_summary/chat_state_populator.vala:59
 msgid "has stopped typing"
 msgstr "已经停止输入"
 
-#: ../src/ui/conversation_summary/message_textview.vala:33
+#: main/src/ui/conversation_summary/default_file_display.vala:49
+msgid "File"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:39
 msgid "Message too long"
 msgstr ""
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: main/src/ui/conversation_summary/message_textview.vala:74
+msgid "Copy Link Address"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:82
+msgid "Copy"
+msgstr ""
+
+#: main/src/ui/conversation_summary/message_textview.vala:87
+msgid "Select All"
+msgstr ""
+
+#: main/src/ui/conversation_summary/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:186
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%_m 月 %_d 日，%H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:190
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%_m 月 %_d 日，%l∶%M %p"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:150
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%A，%H∶%M"
 
-#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%A，%l∶%M %p"
 
-#: ../src/ui/occupant_menu/list.vala:105
+#: main/src/ui/occupant_menu/list.vala:105
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/ui/occupant_menu/list.vala:107
+#: main/src/ui/occupant_menu/list.vala:107
 msgid "Admin"
 msgstr "管理员"
 
-#: ../src/ui/occupant_menu/list.vala:109
+#: main/src/ui/occupant_menu/list.vala:109
 msgid "Member"
 msgstr "成员"
 
-#: ../src/ui/occupant_menu/list.vala:111
+#: main/src/ui/occupant_menu/list.vala:111
 msgid "User"
 msgstr "用户"
 
-#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+#: main/src/ui/occupant_menu/view.vala:26
+#: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:34
+#: main/src/ui/occupant_menu/view.vala:34
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../src/ui/occupant_menu/view.vala:84
+#: main/src/ui/occupant_menu/view.vala:84
 msgid "Start private conversation"
 msgstr "启动私密会话"
 
-#: ../src/ui/occupant_menu/view.vala:92
+#: main/src/ui/occupant_menu/view.vala:92
 msgid "Kick"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37
+#: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
 msgstr ""
 
-#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "联系人详情"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+#: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
 msgstr "房间名称"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+#: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
 msgstr "房间的描述"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+#: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
 msgstr "一直在线"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+#: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
 msgstr "此房间将一直保持存在直到最后一个人离开"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+#: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
 msgstr "公开可搜索"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+#: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
 msgstr "参与者可以更改主题"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+#: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
 msgstr "发现真实 JID"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
 msgstr "谁可能发现真实 JID？"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:59
-#: ../data/manage_accounts/dialog.ui:166
-#: ../data/manage_accounts/add_account_dialog.ui:73
-#: ../data/add_conversation/conference_details_fragment.ui:175
-#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: main/src/ui/contact_details/muc_config_form_provider.vala:59
+#: main/data/manage_accounts/dialog.ui:166
+#: main/data/manage_accounts/add_account_dialog.ui:73
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
 msgstr "密码"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
 msgstr ""
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
 msgstr "主持"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+#: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
 msgstr "只有有声音的参与者可以发送消息"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
 msgstr "仅限成员"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+#: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
 msgstr "只有成员才可以进入房间"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
 msgstr "消息历史记录"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+#: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
 msgstr "返回的房间的历史消息的最大数目"
 
-#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
 msgstr "房间配置"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/data/menu_app.ui:10
 msgid "Settings"
 msgstr "设置"
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
 msgstr ""
 
-#: ../src/ui/contact_details/blocking_provider.vala:31
+#: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: ../src/ui/contact_details/settings_provider.vala:22
-#: ../data/settings_dialog.ui:22
+#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "发送打字通知"
 
-#: ../src/ui/contact_details/settings_provider.vala:25
-#: ../data/settings_dialog.ui:34
+#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/data/settings_dialog.ui:34
 msgid "Send message marker"
 msgstr "发送消息标记"
 
-#: ../src/ui/contact_details/settings_provider.vala:30
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:39
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/ui/contact_details/settings_provider.vala:39
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:74
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:76
+#: main/src/ui/contact_details/settings_provider.vala:114
+#: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
 msgstr "关闭"
 
-#: ../src/ui/contact_details/settings_provider.vala:78
+#: main/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
+#: main/src/ui/contact_details/settings_provider.vala:80
+#: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
-#: ../data/settings_dialog.ui:7
+#: main/data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "选项"
 
-#: ../data/settings_dialog.ui:46
+#: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "新消息到达时通知"
 
-#: ../data/settings_dialog.ui:58
+#: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "将笑脸转换成 Emoji"
 
-#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:6
 msgid "Accounts"
 msgstr "帐号"
 
-#: ../data/manage_accounts/dialog.ui:196
-#: ../data/manage_accounts/add_account_dialog.ui:102
+#: main/data/manage_accounts/dialog.ui:196
+#: main/data/manage_accounts/add_account_dialog.ui:102
 msgid "Local alias"
 msgstr "本地别名"
 
-#: ../data/manage_accounts/dialog.ui:251
+#: main/data/manage_accounts/dialog.ui:251
 msgid "No accounts configured"
 msgstr ""
 
-#: ../data/manage_accounts/dialog.ui:262
+#: main/data/manage_accounts/dialog.ui:262
 msgid "Add an account"
 msgstr "添加新账号"
 
-#: ../data/menu_encryption.ui:14
+#: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../data/menu_app.ui:16
+#: main/data/menu_app.ui:16
 msgid "Quit"
 msgstr "退出"
 
-#: ../data/conversation_selector/view.ui:14
+#: main/data/conversation_selector/view.ui:14
 msgid "Search"
 msgstr "搜索"
 
-#: ../data/add_conversation/conference_details_fragment.ui:19
-#: ../data/add_conversation/add_groupchat_dialog.ui:49
-#: ../data/add_conversation/add_contact_dialog.ui:48
+#: main/data/add_conversation/conference_details_fragment.ui:19
+#: main/data/add_conversation/add_groupchat_dialog.ui:49
+#: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
 msgstr "账号"
 
-#: ../data/add_conversation/conference_details_fragment.ui:123
-#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
 msgstr "昵称"
 
-#: ../data/add_conversation/add_groupchat_dialog.ui:175
-#: ../data/add_conversation/add_contact_dialog.ui:101
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
 msgstr "别名"
 
-#: ../data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "请求在线更新"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#~ msgid "Request presence updates"
+#~ msgstr "请求在线更新"
 
 #~ msgid "Join on startup"
 #~ msgstr "启动时加入"