diff --git a/app/script/localization/strings-de.coffee b/app/script/localization/strings-de.coffee
index b57f327d061..44c95ed1d1f 100644
--- a/app/script/localization/strings-de.coffee
+++ b/app/script/localization/strings-de.coffee
@@ -125,7 +125,7 @@ z.string.de.modal_button_send = 'Senden'
 
 # Block a user
 z.string.de.modal_block_conversation_headline = '%@.name blockieren?'
-z.string.de.modal_block_conversation_message = '%@.name wird dich auf Wire nicht finden können.'
+z.string.de.modal_block_conversation_message = '%@.name wird dich nicht länger kontaktieren oder zu Gruppen hinzufügen können.'
 z.string.de.modal_block_conversation_button = 'Blockieren'
 # Cannot create the call because there is nobody to call (conversation_empty)
 z.string.de.modal_call_conversation_empty_headline = 'Niemand um anzurufen'
@@ -186,7 +186,7 @@ z.string.de.modal_logout_message = 'Deine persönlichen Daten und Unterhaltungen
 z.string.de.modal_logout_button = 'Abmelden'
 # New device
 z.string.de.modal_new_device_headline = '%@.name hat begonnen ein neues Gerät zu nutzen'
-z.string.de.modal_new_device_headline_many = '%@.names haben begonnen ein neues Gerät zu nutzen'
+z.string.de.modal_new_device_headline_many = '%@.names haben begonnen neue Geräte zu nutzen'
 z.string.de.modal_new_device_headline_you = '%@.name hast begonnen ein neues Gerät zu nutzen'
 z.string.de.modal_new_device_message = 'Möchtest du die Nachrichten noch senden?'
 z.string.de.modal_new_device_show_device = 'Gerät anzeigen'
@@ -273,6 +273,9 @@ z.string.de.conversation_send_pasted_file = 'Bild eingefügt am %date'
 
 # Collection
 z.string.de.collection_show_all = 'Zeige alle %no'
+z.string.de.collection_section_links = 'Links'
+z.string.de.collection_section_images = 'Bilder'
+z.string.de.collection_section_files = 'Dateien'
 
 # Archive
 z.string.de.archive_header = 'Archivieren'
@@ -351,7 +354,7 @@ z.string.de.people_verified = 'Verifiziert'
 
 # Block user
 z.string.de.people_block_headline = 'Blockieren?'
-z.string.de.people_block_message = '%@.first_name wird dich auf Wire nicht finden können.'
+z.string.de.people_block_message = '%@.first_name wird dich nicht länger kontaktieren oder zu Gruppen hinzufügen können.'
 
 # Accept a pending connection dialogue
 z.string.de.people_connect_headline = 'Annehmen?'
@@ -371,7 +374,7 @@ z.string.de.people_remove_message = '%@.first_name wird in dieser Unterhaltung k
 
 # Unblock user
 z.string.de.people_unblock_headline = 'Freigeben?'
-z.string.de.people_unblock_message = '%@.first_name wird dich über Wire wieder finden und kontaktieren können. Du empfängst alle Nachrichten die verschickt wurden, während der Kontakt blockiert war.'
+z.string.de.people_unblock_message = '%@.first_name wird dich wieder kontaktieren und zu Gruppen hinzufügen können.'
 
 # Button labels for the actions
 z.string.de.people_button_add = 'Kontakte hinzufügen'
diff --git a/app/script/localization/strings-es.coffee b/app/script/localization/strings-es.coffee
index 57c122052de..afa4ee1ad74 100644
--- a/app/script/localization/strings-es.coffee
+++ b/app/script/localization/strings-es.coffee
@@ -271,6 +271,7 @@ z.string.es.conversation_likes_caption = '%@numbero de personas'
 z.string.es.conversation_send_pasted_file = 'Imagen pegada el %date'
 
 # Collection
+z.string.es.collection_show_all = 'Mostrar los %no'
 
 # Archive
 z.string.es.archive_header = 'Archivar'
@@ -304,8 +305,8 @@ z.string.es.invite_meta_key_pc = 'Ctrl'
 z.string.es.invite_hint_selected = 'Pulse %meta_key + C para copiar'
 z.string.es.invite_hint_unselected = 'Seleccione y pulse %meta_key + C'
 z.string.es.invite_headline = 'Invitar amigos a Wire'
-z.string.es.invite_message = 'Estoy en Wire, búscame como %username o visita wire.com/download.'
-z.string.es.invite_message_no_email = 'Estoy en Wire. Visita https://get.wire.com para conectar conmigo.'
+z.string.es.invite_message = 'Estoy en Wire, búscame como %username o visita get.wire.com.'
+z.string.es.invite_message_no_email = 'Estoy en Wire. Visita get.wire.com para conectar conmigo.'
 
 # Extensions
 z.string.es.extensions_bubble_button_gif = 'Gif'
@@ -329,6 +330,7 @@ z.string.es.people_no_matches = 'No hay resultados coincidentes. Intente con un
 z.string.es.people_invite = 'Invitar gente'
 z.string.es.people_share = 'Compartir contactos'
 z.string.es.people_bring_your_friends = 'Invita a tus amigos a Wire'
+z.string.es.people_invite_detail = 'Compartir tus contactos te ayuda a conectar con otros. Anonimizamos toda la información y no la compartimos con nadie.'
 z.string.es.people_invite_button_contacts = 'Desde los contactos'
 z.string.es.people_invite_button_gmail = 'Desde Gmail'
 z.string.es.people_invite_headline = 'Tráete a tus amigos'
@@ -475,6 +477,7 @@ z.string.es.upload_google_message_error = 'No recibimos tu información. Por fav
 z.string.es.upload_google_button_again = 'Vuelve a intentarlo'
 
 # URLs
+z.string.es.url_password_reset = 'forgot/?hl=es'
 z.string.es.url_legal = 'https://wire.com/legal/'
 z.string.es.url_privacy = 'https://wire.com/privacy/'
 z.string.es.url_privacy_why = 'https://wire.com/privacy/why/'
@@ -522,6 +525,7 @@ z.string.es.warning_connectivity_no_internet = 'No hay Internet. No podrás envi
 # Browser notifications
 z.string.es.system_notification_asset_add = 'Compartió una foto'
 z.string.es.system_notification_connection_accepted = 'Aceptó tu solicitud de conexión'
+z.string.es.system_notification_connection_connected = 'Están conectados'
 z.string.es.system_notification_connection_request = 'Quiere conectar'
 z.string.es.system_notification_conversation_create = '%s.first_name inició una conversación'
 z.string.es.system_notification_conversation_rename = '%s.first_name renombró la conversación a %name'
diff --git a/app/script/localization/strings-fi.coffee b/app/script/localization/strings-fi.coffee
index f34c5562518..226a626cc18 100644
--- a/app/script/localization/strings-fi.coffee
+++ b/app/script/localization/strings-fi.coffee
@@ -268,6 +268,13 @@ z.string.fi.conversation_context_menu_unlike = 'Poista tykkäys'
 z.string.fi.conversation_delete_timestamp = 'Poistettu %@timestamp'
 z.string.fi.conversation_edit_timestamp = 'Muokattu %@timestamp'
 z.string.fi.conversation_likes_caption = '%@number henkeä'
+z.string.fi.conversation_send_pasted_file = 'Liitti kuvan %date'
+
+# Collection
+z.string.fi.collection_show_all = 'Näytä kaikki %no'
+z.string.fi.collection_section_links = 'Linkit'
+z.string.fi.collection_section_images = 'Kuvat'
+z.string.fi.collection_section_files = 'Tiedostot'
 
 # Archive
 z.string.fi.archive_header = 'Arkistoi'
@@ -301,8 +308,8 @@ z.string.fi.invite_meta_key_pc = 'Ctrl'
 z.string.fi.invite_hint_selected = 'Paina %meta_key + C kopioidaksesi'
 z.string.fi.invite_hint_unselected = 'Valitse ja paina %meta_key + C'
 z.string.fi.invite_headline = 'Kutsu ihmisiä Wireen'
-z.string.fi.invite_message = 'Olen Wiressä, etsi %username tai mene osoitteeseen wire.com/download.'
-z.string.fi.invite_message_no_email = 'Olen Wiressä. Mene osoitteeseen https://get.wire.com ottaaksesi yhteyttä minuun.'
+z.string.fi.invite_message = 'Olen Wiressä, etsi %username tai mene osoitteeseen get.wire.com.'
+z.string.fi.invite_message_no_email = 'Olen Wiressä. Mene osoitteeseen get.wire.com ottaaksesi minuun yhteyttä.'
 
 # Extensions
 z.string.fi.extensions_bubble_button_gif = 'Gif'
@@ -326,6 +333,7 @@ z.string.fi.people_no_matches = 'Ei vastaavia tuloksia. Yritä toisella nimellä
 z.string.fi.people_invite = 'Kutsu ihmisiä'
 z.string.fi.people_share = 'Jaa yhteystietoja'
 z.string.fi.people_bring_your_friends = 'Tuo ystäväsi Wireen'
+z.string.fi.people_invite_detail = 'Yhteystietojesi jakaminen auttaa sinua löytämään uusia kontakteja. Anonymisoimme kaiken tiedon ja emme jaa sitä ulkopuolisille.'
 z.string.fi.people_invite_button_contacts = 'Kontakteista'
 z.string.fi.people_invite_button_gmail = 'Gmailista'
 z.string.fi.people_invite_headline = 'Kutsu kavereitasi'
@@ -447,7 +455,8 @@ z.string.fi.preferences_options_data_checkbox = 'Käyttö- ja vikaraportit'
 z.string.fi.preferences_options_data_detail = 'Tee Wirestä parempi lähetämällä anonyymiä tietoa.'
 z.string.fi.preferences_options_notifications = 'Ilmoitukset'
 z.string.fi.preferences_options_notifications_none = 'Pois päältä'
-z.string.fi.preferences_options_notifications_obfuscate = 'Piilota viestin tiedot'
+z.string.fi.preferences_options_notifications_obfuscate = 'Piilota yksityiskohdat'
+z.string.fi.preferences_options_notifications_obfuscate_message = 'Näytä lähettäjä'
 z.string.fi.preferences_options_notifications_on = 'Näytä lähettäjä ja viesti'
 
 # Search
@@ -455,7 +464,10 @@ z.string.fi.search_group_hint = 'Jatka kirjoittamista tai valitse lisää ihmisi
 z.string.fi.search_connect = 'Yhdistä'
 z.string.fi.search_connections = 'Yhteydet'
 z.string.fi.search_groups = 'Ryhmät'
+z.string.fi.search_placeholder = 'Etsi nimellä tai käyttäjänimellä'
 z.string.fi.search_top_people = 'Eniten käytetyt kontaktit'
+z.string.fi.search_try_search = 'Etsi käyttäjiä nimellä tai käyttäjänimellä'
+z.string.fi.search_no_contacts_on_wire = 'Sinulla ei ole kontakteja Wiressä. Yritä etsiä muita käyttäjiä nimellä tai käyttäjänimellä.'
 z.string.fi.search_others = 'Yhdistä'
 z.string.fi.search_friend_in_common = '%n yhteinen käyttäjä molemmilla'
 z.string.fi.search_friends_in_common = '%n yhteistä käyttäjää molemmilla'
@@ -515,6 +527,7 @@ z.string.fi.warning_connectivity_no_internet = 'Ei Internetiä. Et pysty lähett
 # Browser notifications
 z.string.fi.system_notification_asset_add = 'Jakoi kuvan'
 z.string.fi.system_notification_connection_accepted = 'Hyväksyi yhteyspyyntösi'
+z.string.fi.system_notification_connection_connected = 'Yhteys muodostettu'
 z.string.fi.system_notification_connection_request = 'Haluaa luoda kontaktin'
 z.string.fi.system_notification_conversation_create = '%s.first_name aloitti keskustelun'
 z.string.fi.system_notification_conversation_rename = '%s.first_name nimesi keskustelun uudelleen %nameksi'
diff --git a/app/script/localization/strings-fr.coffee b/app/script/localization/strings-fr.coffee
index eaecf2c8368..59d9ac96ea7 100644
--- a/app/script/localization/strings-fr.coffee
+++ b/app/script/localization/strings-fr.coffee
@@ -304,7 +304,8 @@ z.string.fr.invite_meta_key_pc = 'Ctrl'
 z.string.fr.invite_hint_selected = 'Appuyez sur %meta_key + C pour copier'
 z.string.fr.invite_hint_unselected = 'Sélectionnez et appuyez sur %meta_key + C'
 z.string.fr.invite_headline = 'Invitez des gens sur Wire'
-z.string.fr.invite_message_no_email = 'Je suis sur Wire. Visitez https://get.wire.com afin de vous connecter avec moi.'
+z.string.fr.invite_message = 'Je suis sur Wire, cherche %username ou va voir get.wire.com .'
+z.string.fr.invite_message_no_email = 'Je suis sur Wire. Va voir get.wire.com pour te connecter avec moi.'
 
 # Extensions
 z.string.fr.extensions_bubble_button_gif = 'Gif'
@@ -328,6 +329,7 @@ z.string.fr.people_no_matches = 'Pas de résultats.\nEssayez avec un nom différ
 z.string.fr.people_invite = 'Inviter des personnes'
 z.string.fr.people_share = 'Partagez vos contacts'
 z.string.fr.people_bring_your_friends = 'Amenez vos amis sur Wire'
+z.string.fr.people_invite_detail = 'Le fait de partager vos contacts vous aide à vous connecter à d’autres personnes. Nous gardons anonyme toute information et ne le partageons avec personne d’autre.'
 z.string.fr.people_invite_button_contacts = 'Depuis vos Contacts'
 z.string.fr.people_invite_button_gmail = 'Depuis Gmail'
 z.string.fr.people_invite_headline = 'Amenez vos amis'
@@ -458,7 +460,7 @@ z.string.fr.search_group_hint = 'Continuez d’écrire ou ajoutez plus de person
 z.string.fr.search_connect = 'Connecter'
 z.string.fr.search_connections = 'Connexions'
 z.string.fr.search_groups = 'Groupes'
-z.string.fr.search_placeholder = 'Rechercher par nom ou par identifiant'
+z.string.fr.search_placeholder = 'Chercher par nom ou par identifiant'
 z.string.fr.search_top_people = 'Personnes favorites'
 z.string.fr.search_try_search = 'Trouver des personnes par\nnom ou nom d’utilisateur'
 z.string.fr.search_no_contacts_on_wire = 'Vous n’avez pas de contacts sur Wire.\nEssayez de trouver des gens par\nleur nom ou leur nom d’utilisateur.'
@@ -521,6 +523,7 @@ z.string.fr.warning_connectivity_no_internet = 'Pas d’Internet. Vous ne pourre
 # Browser notifications
 z.string.fr.system_notification_asset_add = 'A partagé une photo'
 z.string.fr.system_notification_connection_accepted = 'A accepté votre demande de connexion'
+z.string.fr.system_notification_connection_connected = 'Sont maintenant connectés'
 z.string.fr.system_notification_connection_request = 'Souhaite se connecter'
 z.string.fr.system_notification_conversation_create = '%s.first_name a démarré une conversation'
 z.string.fr.system_notification_conversation_rename = '%s.first_name a renommé la conversation en %name'
diff --git a/app/script/localization/strings-hr.coffee b/app/script/localization/strings-hr.coffee
index 1ad7c4f7c0d..320381040d6 100644
--- a/app/script/localization/strings-hr.coffee
+++ b/app/script/localization/strings-hr.coffee
@@ -270,6 +270,8 @@ z.string.hr.conversation_edit_timestamp = 'Promijenjeno na %@timestamp'
 z.string.hr.conversation_likes_caption = '%@number ljudi'
 z.string.hr.conversation_send_pasted_file = 'Slika zaljepljena na %date'
 
+# Collection
+
 # Archive
 z.string.hr.archive_header = 'Arhiviraj'
 
diff --git a/app/script/localization/strings-it.coffee b/app/script/localization/strings-it.coffee
index 659616415c5..6b7971ae92f 100644
--- a/app/script/localization/strings-it.coffee
+++ b/app/script/localization/strings-it.coffee
@@ -270,6 +270,8 @@ z.string.it.conversation_edit_timestamp = 'Modificato il %@timestamp'
 z.string.it.conversation_likes_caption = '%@number persone'
 z.string.it.conversation_send_pasted_file = 'Immagine incollata alle %date'
 
+# Collection
+
 # Archive
 z.string.it.archive_header = 'Archivia'
 
diff --git a/app/script/localization/strings-pt.coffee b/app/script/localization/strings-pt.coffee
index a0cfb7c309a..3c6d8360c69 100644
--- a/app/script/localization/strings-pt.coffee
+++ b/app/script/localization/strings-pt.coffee
@@ -270,6 +270,9 @@ z.string.pt.conversation_edit_timestamp = 'Editado em %@timestamp'
 z.string.pt.conversation_likes_caption = '%@number pessoas'
 z.string.pt.conversation_send_pasted_file = 'Imagem postada em %date'
 
+# Collection
+z.string.pt.collection_show_all = 'Mostrar todas %no'
+
 # Archive
 z.string.pt.archive_header = 'Arquivar'
 
@@ -302,8 +305,8 @@ z.string.pt.invite_meta_key_pc = 'Ctrl'
 z.string.pt.invite_hint_selected = 'Pressione % meta_key + C para copiar'
 z.string.pt.invite_hint_unselected = 'Selecione e pressione % meta_key + C'
 z.string.pt.invite_headline = 'Convidar pessoas para o Wire'
-z.string.pt.invite_message = 'Eu estou no Wire, pesquise por %username ou visite wire.com/download.'
-z.string.pt.invite_message_no_email = 'Estou no Wire. Visite https://get.wire.com para se conectar comigo.'
+z.string.pt.invite_message = 'Eu estou no Wire, pesquise por %username ou visite get.wire.com.'
+z.string.pt.invite_message_no_email = 'Estou no Wire. Visite get.wire.com para se conectar comigo.'
 
 # Extensions
 z.string.pt.extensions_bubble_button_gif = 'Gif'
@@ -327,6 +330,7 @@ z.string.pt.people_no_matches = 'Nenhum resultado correspondente. \nTente digita
 z.string.pt.people_invite = 'Convidar pessoas'
 z.string.pt.people_share = 'Compartilhar Contatos'
 z.string.pt.people_bring_your_friends = 'Traga seus amigos para o Wire'
+z.string.pt.people_invite_detail = 'Compartilhar seus contatos ajuda a se conectar com outras pessoas. Nós tornamos anônimas todas as informações e não compartilhamos com ninguém.'
 z.string.pt.people_invite_button_contacts = 'Dos contatos'
 z.string.pt.people_invite_button_gmail = 'Do Gmail'
 z.string.pt.people_invite_headline = 'Traga os seus amigos'
@@ -520,6 +524,7 @@ z.string.pt.warning_connectivity_no_internet = 'Sem Internet. Não será capaz d
 # Browser notifications
 z.string.pt.system_notification_asset_add = 'Compartilhou uma imagem'
 z.string.pt.system_notification_connection_accepted = 'Aceitou seu pedido de conexão'
+z.string.pt.system_notification_connection_connected = 'Agora estão conectados'
 z.string.pt.system_notification_connection_request = 'Quer se conectar'
 z.string.pt.system_notification_conversation_create = '%s.first_name começou uma conversa'
 z.string.pt.system_notification_conversation_rename = '%s.first_name mudou o nome da conversa para %name'
diff --git a/app/script/localization/strings-ro.coffee b/app/script/localization/strings-ro.coffee
index 5c58b7bd06d..69fb17e2e56 100644
--- a/app/script/localization/strings-ro.coffee
+++ b/app/script/localization/strings-ro.coffee
@@ -270,6 +270,12 @@ z.string.ro.conversation_edit_timestamp = 'A fost editat la %@timestamp'
 z.string.ro.conversation_likes_caption = '%@number persoane'
 z.string.ro.conversation_send_pasted_file = 'A postat o imagine pe %date'
 
+# Collection
+z.string.ro.collection_show_all = 'Arată toate %no'
+z.string.ro.collection_section_links = 'Legături'
+z.string.ro.collection_section_images = 'Imagini'
+z.string.ro.collection_section_files = 'Fișiere'
+
 # Archive
 z.string.ro.archive_header = 'Arhivă'
 
@@ -302,8 +308,8 @@ z.string.ro.invite_meta_key_pc = 'Ctrl'
 z.string.ro.invite_hint_selected = 'Apasă %meta_key + C pentru a copia'
 z.string.ro.invite_hint_unselected = 'Selectează și apasă %meta_key + C'
 z.string.ro.invite_headline = 'Invită persoane pe Wire'
-z.string.ro.invite_message = 'Sunt pe Wire, caută pe %username sau vizitează wire.com/download.'
-z.string.ro.invite_message_no_email = 'Sunt pe Wire. Vizitează https://get.wire.com pentru a te conecta cu mine.'
+z.string.ro.invite_message = 'Bună, sunt pe Wire. Caută-mă cu numele %username sau vizitează get.wire.com.'
+z.string.ro.invite_message_no_email = 'Sunt pe Wire. Vizitează get.wire.com pentru a te conecta cu mine.'
 
 # Extensions
 z.string.ro.extensions_bubble_button_gif = 'Gif'
@@ -327,6 +333,7 @@ z.string.ro.people_no_matches = 'Nu s-a găsit nimic.\nÎncearcă să scrii un a
 z.string.ro.people_invite = 'Invită persoane'
 z.string.ro.people_share = 'Împărtășește contacte'
 z.string.ro.people_bring_your_friends = 'Invită prietenii pe Wire'
+z.string.ro.people_invite_detail = 'Împărtășirea contactelor ne ajută să te conectăm cu alții. Noi anonimizăm toate informațiile și nu le împărtășim cu terți.'
 z.string.ro.people_invite_button_contacts = 'Din Contacte'
 z.string.ro.people_invite_button_gmail = 'Din Gmail'
 z.string.ro.people_invite_headline = 'Invită prietenii'
@@ -520,6 +527,7 @@ z.string.ro.warning_connectivity_no_internet = 'Nu este conexiune la internet. N
 # Browser notifications
 z.string.ro.system_notification_asset_add = 'A împărtășit o imagine'
 z.string.ro.system_notification_connection_accepted = 'A acceptat cererea de conectare a ta'
+z.string.ro.system_notification_connection_connected = 'Acum ești conectat'
 z.string.ro.system_notification_connection_request = 'Așteaptă conectarea'
 z.string.ro.system_notification_conversation_create = '%s.first_name a început o conversație'
 z.string.ro.system_notification_conversation_rename = '%s.first_name a redenumit conversația în %name'
diff --git a/app/script/localization/strings-ru.coffee b/app/script/localization/strings-ru.coffee
index 5792642a451..ac482770ef0 100644
--- a/app/script/localization/strings-ru.coffee
+++ b/app/script/localization/strings-ru.coffee
@@ -271,6 +271,10 @@ z.string.ru.conversation_likes_caption = '%@number участникам'
 z.string.ru.conversation_send_pasted_file = 'Изображение добавлено %date'
 
 # Collection
+z.string.ru.collection_show_all = 'Показать все %no'
+z.string.ru.collection_section_links = 'Ссылки'
+z.string.ru.collection_section_images = 'Изображения'
+z.string.ru.collection_section_files = 'Файлы'
 
 # Archive
 z.string.ru.archive_header = 'Архив'
@@ -304,8 +308,8 @@ z.string.ru.invite_meta_key_pc = 'Ctrl'
 z.string.ru.invite_hint_selected = 'Нажмите %meta_key + C для копирования'
 z.string.ru.invite_hint_unselected = 'Выделите и нажмите %meta_key + C'
 z.string.ru.invite_headline = 'Пригласите людей в Wire'
-z.string.ru.invite_message = 'Я использую Wire, введи в поиске %username или перейди на wire.com/download.'
-z.string.ru.invite_message_no_email = 'Я использую Wire. Перейди на https://get.wire.com, чтобы связаться со мной.'
+z.string.ru.invite_message = 'Я использую Wire, ищите меня там по имени %username или посетите сайт get.wire.com.'
+z.string.ru.invite_message_no_email = 'Я использую Wire. Перейдите на get.wire.com, чтобы связаться со мной.'
 
 # Extensions
 z.string.ru.extensions_bubble_button_gif = 'Gif'
@@ -329,6 +333,7 @@ z.string.ru.people_no_matches = 'Совпадений не найдено.\nПо
 z.string.ru.people_invite = 'Пригласить людей'
 z.string.ru.people_share = 'Поделиться контактами'
 z.string.ru.people_bring_your_friends = 'Приведите друзей в Wire'
+z.string.ru.people_invite_detail = 'Предоставление доступа к вашим контактам поможет вам связаться с другими людьми. Вся информация анонимна, мы не предоставляем её третьим лицам.'
 z.string.ru.people_invite_button_contacts = 'Из контактов'
 z.string.ru.people_invite_button_gmail = 'Из Gmail'
 z.string.ru.people_invite_headline = 'Приведите друзей'
@@ -475,6 +480,7 @@ z.string.ru.upload_google_message_error = 'Мы не получили вашу 
 z.string.ru.upload_google_button_again = 'Повторить'
 
 # URLs
+z.string.ru.url_password_reset = 'forgot/?hl=ru'
 z.string.ru.url_legal = 'https://wire.com/legal/'
 z.string.ru.url_privacy = 'https://wire.com/privacy/'
 z.string.ru.url_privacy_why = 'https://wire.com/privacy/why/'
diff --git a/app/script/localization/strings-sl.coffee b/app/script/localization/strings-sl.coffee
index 6f853b55ce0..bc7cc0eb8ee 100644
--- a/app/script/localization/strings-sl.coffee
+++ b/app/script/localization/strings-sl.coffee
@@ -270,6 +270,12 @@ z.string.sl.conversation_edit_timestamp = 'Urejen ob %@timestamp'
 z.string.sl.conversation_likes_caption = '%@number oseb'
 z.string.sl.conversation_send_pasted_file = 'Prilepljena slika ob %date'
 
+# Collection
+z.string.sl.collection_show_all = 'Prikaži vse %no'
+z.string.sl.collection_section_links = 'Povezave'
+z.string.sl.collection_section_images = 'Slike'
+z.string.sl.collection_section_files = 'Zbirke'
+
 # Archive
 z.string.sl.archive_header = 'Arhiviraj'
 
@@ -302,8 +308,8 @@ z.string.sl.invite_meta_key_pc = 'Ctrl'
 z.string.sl.invite_hint_selected = 'Pritisnite %meta_key + C za kopiranje'
 z.string.sl.invite_hint_unselected = 'Izberite in pritisnite %meta_key + C'
 z.string.sl.invite_headline = 'Povabite osebe na Wire'
-z.string.sl.invite_message = 'Sem na Wire, poišči %username ali obišči wire.com/download.'
-z.string.sl.invite_message_no_email = 'Sem na Wire. Obišči https://get.wire.com za povezavo z mano.'
+z.string.sl.invite_message = 'Sem na Wire, poišči %username ali obišči get.wire.com.'
+z.string.sl.invite_message_no_email = 'Sem na Wire. Obišči get.wire.com za povezavo z mano.'
 
 # Extensions
 z.string.sl.extensions_bubble_button_gif = 'Gif'
@@ -327,6 +333,7 @@ z.string.sl.people_no_matches = 'Brez ujemanja rezultatov. \nPoizkusite vnesti d
 z.string.sl.people_invite = 'Povabite osebe'
 z.string.sl.people_share = 'Deli Stike'
 z.string.sl.people_bring_your_friends = 'Pripeljite svoje prijatelje na Wire'
+z.string.sl.people_invite_detail = 'Deljenje vaših stikov pomaga pri povezovanju z drugimi. Vse informacije anonimiziramo in ne delimo z drugimi.'
 z.string.sl.people_invite_button_contacts = 'Iz imenika stikov'
 z.string.sl.people_invite_button_gmail = 'Iz Gmail'
 z.string.sl.people_invite_headline = 'Pripeljite vaše prijatelje'
@@ -513,6 +520,7 @@ z.string.sl.warning_connectivity_no_internet = 'Ni spletne povezave. Ne boste mo
 # Browser notifications
 z.string.sl.system_notification_asset_add = 'Je delil(-a) sliko'
 z.string.sl.system_notification_connection_accepted = 'Je sprejel(-a) vašo zahtevo po povezavi'
+z.string.sl.system_notification_connection_connected = 'Sta zdaj povezana'
 z.string.sl.system_notification_connection_request = 'Si želi povezati'
 z.string.sl.system_notification_conversation_create = '%s.first_name je začel(-a) pogovor'
 z.string.sl.system_notification_conversation_rename = '%s.first_name je preimenoval(-a) pogovor v %name'
diff --git a/app/script/localization/strings-tr.coffee b/app/script/localization/strings-tr.coffee
index eaf91960e39..5c7f592fc06 100644
--- a/app/script/localization/strings-tr.coffee
+++ b/app/script/localization/strings-tr.coffee
@@ -270,6 +270,12 @@ z.string.tr.conversation_edit_timestamp = '%@timestamp ’da düzenlenmiş'
 z.string.tr.conversation_likes_caption = '%@number kişi'
 z.string.tr.conversation_send_pasted_file = 'Yapıştırılmış resim, %date ’de'
 
+# Collection
+z.string.tr.collection_show_all = '%no’nun tümünü göster'
+z.string.tr.collection_section_links = 'Bağlantılar'
+z.string.tr.collection_section_images = 'Resimler'
+z.string.tr.collection_section_files = 'Dosyalar'
+
 # Archive
 z.string.tr.archive_header = 'Arşivle'
 
@@ -302,8 +308,8 @@ z.string.tr.invite_meta_key_pc = 'Ctrl'
 z.string.tr.invite_hint_selected = 'Kopyalamak için %meta_key + C'
 z.string.tr.invite_hint_unselected = 'Seç ve %meta_key + C tuşlarına bas'
 z.string.tr.invite_headline = 'İnsanların Wire’a davet et'
-z.string.tr.invite_message = 'Wire’dayım, %username olarak arat ya da wire.com/download bu adresi ziyaret et.'
-z.string.tr.invite_message_no_email = 'Wire’dayım. https://get.wire.com ’u ziyaret ederek bana bağlanabilirsin.'
+z.string.tr.invite_message = 'Wire’dayım, %username olarak arat ya da get.wire.com adresini ziyaret et.'
+z.string.tr.invite_message_no_email = 'Wire’dayım. get.wire.com ’u ziyaret ederek bana bağlanabilirsin.'
 
 # Extensions
 z.string.tr.extensions_bubble_button_gif = 'Gif'
@@ -327,6 +333,7 @@ z.string.tr.people_no_matches = 'Eşleşen sonuç yok.\nBaşka bir isim girmeyi
 z.string.tr.people_invite = 'İnsanları davet et'
 z.string.tr.people_share = 'Kişileri Paylaş'
 z.string.tr.people_bring_your_friends = 'Arkadaşlarını Wire’a getir'
+z.string.tr.people_invite_detail = 'Kişileriniz paylaşmak, başkalarıyla bağlanmanızı kolaylaştırır. Tüm bilgilerinizi gizler ve kimseyle paylaşmayız.'
 z.string.tr.people_invite_button_contacts = 'Kişilerden'
 z.string.tr.people_invite_button_gmail = 'Gmail’den'
 z.string.tr.people_invite_headline = 'Arkadaşlarınızı getirin'
@@ -521,6 +528,7 @@ z.string.tr.warning_connectivity_no_internet = 'İnternet bağlantısı yok. Mes
 # Browser notifications
 z.string.tr.system_notification_asset_add = 'Bir resim paylaştı'
 z.string.tr.system_notification_connection_accepted = 'Bağlantı isteğinizi kabul etti'
+z.string.tr.system_notification_connection_connected = 'Şimdi bağlı'
 z.string.tr.system_notification_connection_request = 'Bağlanmak istiyor'
 z.string.tr.system_notification_conversation_create = '%s.first_name bir konuşma başlattı'
 z.string.tr.system_notification_conversation_rename = '%s.first_name, konuşma ismini %name olarak değiştirdi'
diff --git a/app/script/localization/strings-uk.coffee b/app/script/localization/strings-uk.coffee
index 8ca28fa9666..0ca923f6cb4 100644
--- a/app/script/localization/strings-uk.coffee
+++ b/app/script/localization/strings-uk.coffee
@@ -271,6 +271,7 @@ z.string.uk.conversation_likes_caption = '%@number учасників'
 z.string.uk.conversation_send_pasted_file = 'Надіслав(-ла) зображення %date'
 
 # Collection
+z.string.uk.collection_show_all = 'Показати всі %no'
 
 # Archive
 z.string.uk.archive_header = 'Архівувати'
@@ -304,7 +305,8 @@ z.string.uk.invite_meta_key_pc = 'Ctrl'
 z.string.uk.invite_hint_selected = 'Натисніть %meta_key + C, щоб скопіювати'
 z.string.uk.invite_hint_unselected = 'Виділіть та натисніть %meta_key + C'
 z.string.uk.invite_headline = 'Запросити людей в Wire'
-z.string.uk.invite_message_no_email = 'Я уже в Wire. Відвідайте https://get.wire.com, щоб додати мене.'
+z.string.uk.invite_message = 'Я в Wire. Шукайте мене як %username або відвідайте get.wire.com.'
+z.string.uk.invite_message_no_email = 'Я уже в Wire. Відвідайте get.wire.com, щоб додати мене.'
 
 # Extensions
 z.string.uk.extensions_bubble_button_gif = 'Gif'
@@ -328,6 +330,7 @@ z.string.uk.people_no_matches = 'Співпадіння відсутні.\nСп
 z.string.uk.people_invite = 'Запросити людей'
 z.string.uk.people_share = 'Поділитись контактами'
 z.string.uk.people_bring_your_friends = 'Запросіть ваших друзів до Wire'
+z.string.uk.people_invite_detail = 'Поділившись контактами, ви зможете зв’язатись в Wire з людьми, з якими ви, можливо, знайомі. Вся інформація анонімна та не передається третім особам.'
 z.string.uk.people_invite_button_contacts = 'З контактів'
 z.string.uk.people_invite_button_gmail = 'З Gmail'
 z.string.uk.people_invite_headline = 'Приведіть друзів'
@@ -522,6 +525,7 @@ z.string.uk.warning_connectivity_no_internet = 'Відсутнє підключ
 # Browser notifications
 z.string.uk.system_notification_asset_add = 'Поділився(-лась) картинкою'
 z.string.uk.system_notification_connection_accepted = 'Прийняв(-ла) ваш запит на додавання до контактів'
+z.string.uk.system_notification_connection_connected = 'Уже у вашому списку контактів'
 z.string.uk.system_notification_connection_request = 'Хоче бути доданим(-ою) до ваших контактів'
 z.string.uk.system_notification_conversation_create = '%s.first_name почав(-ла) розмову'
 z.string.uk.system_notification_conversation_rename = '%s.first_name перейменував(-ла) розмову на %name'
diff --git a/app/script/localization/strings.coffee b/app/script/localization/strings.coffee
index d59b1ea3bd2..903fc56a96d 100644
--- a/app/script/localization/strings.coffee
+++ b/app/script/localization/strings.coffee
@@ -125,7 +125,7 @@ z.string.modal_button_send = 'Send'
 
 # Block a user
 z.string.modal_block_conversation_headline = 'Block %@.name?'
-z.string.modal_block_conversation_message = '%@.name wont be able to contact you or invite you to a group conversation.'
+z.string.modal_block_conversation_message = '%@.name won’t be able to contact you or add you to group conversations.'
 z.string.modal_block_conversation_button = 'Block'
 # Cannot create the call because there is nobody to call (conversation_empty)
 z.string.modal_call_conversation_empty_headline = 'No one to call'
@@ -186,7 +186,7 @@ z.string.modal_logout_message = 'Delete all your personal information and conver
 z.string.modal_logout_button = 'Log out'
 # New device
 z.string.modal_new_device_headline = '%@.name started using a new device'
-z.string.modal_new_device_headline_many = '%@.names started using a new device'
+z.string.modal_new_device_headline_many = '%@.names started using new devices'
 z.string.modal_new_device_headline_you = '%@.name started using a new device'
 z.string.modal_new_device_message = 'Do you still want to send your messages?'
 z.string.modal_new_device_show_device = 'show device'
@@ -354,7 +354,7 @@ z.string.people_verified = 'Verified'
 
 # Block user
 z.string.people_block_headline = 'Block?'
-z.string.people_block_message = '%@.first_name won’t be able to find or contact you on Wire.'
+z.string.people_block_message = '%@.first_name won’t be able to contact you or add you to group conversations.'
 
 # Accept a pending connection dialogue
 z.string.people_connect_headline = 'Accept?'
@@ -374,7 +374,7 @@ z.string.people_remove_message = '%@.first_name won’t be able to send or recei
 
 # Unblock user
 z.string.people_unblock_headline = 'Unblock?'
-z.string.people_unblock_message = '%@.first_name will be able to find and contact you on Wire again. You’ll also receive messages they sent while blocked.'
+z.string.people_unblock_message = '%@.first_name will be able to contact you and add you to group conversations again.'
 
 # Button labels for the actions
 z.string.people_button_add = 'Add people'
diff --git a/app/script/tracking/EventName.coffee b/app/script/tracking/EventName.coffee
index f3f849c79c9..fd54d153f47 100644
--- a/app/script/tracking/EventName.coffee
+++ b/app/script/tracking/EventName.coffee
@@ -46,6 +46,10 @@ z.tracking.EventName =
     OPENED_GENERIC_INVITE_MENU: 'connect.opened_generic_invite_menu'
   CONTACTS:
     ENTERED_SEARCH: 'contacts.entered_search'
+  COLLECTION:
+    DID_ITEM_ACTION: 'collections.did_item_action'
+    OPENED_COLLECTIONS: 'collections.opened_collections'
+    OPENED_ITEM: 'collections.opened_item'
   CONVERSATION:
     ADD_TO_GROUP_CONVERSATION: 'addContactToGroupConversation'
     CHARACTER_LIMIT_REACHED: 'conversation.character_limit_reached'
diff --git a/app/script/view_model/ImageDetailViewViewModel.coffee b/app/script/view_model/ImageDetailViewViewModel.coffee
index 642b2699bee..ce85c8a7e26 100644
--- a/app/script/view_model/ImageDetailViewViewModel.coffee
+++ b/app/script/view_model/ImageDetailViewViewModel.coffee
@@ -22,8 +22,9 @@ z.ViewModel ?= {}
 class z.ViewModel.ImageDetailViewViewModel
   constructor: (@element_id, @conversation_repository) ->
 
-    @image_modal = undefined
+    @source = undefined
 
+    @image_modal = undefined
     @image_src = ko.observable()
     @image_visible = ko.observable false
 
@@ -36,7 +37,8 @@ class z.ViewModel.ImageDetailViewViewModel
 
     ko.applyBindings @, document.getElementById @element_id
 
-  show: (message_et) =>
+  show: (message_et, source) =>
+    @source = source
     @message_et message_et
 
     @image_modal.destroy() if @image_modal?
@@ -52,6 +54,7 @@ class z.ViewModel.ImageDetailViewViewModel
   _hide_callback: =>
     window.URL.revokeObjectURL @image_src()
     @image_src undefined
+    @source = undefined
 
   _before_hide_callback: =>
     @image_visible false
@@ -60,19 +63,31 @@ class z.ViewModel.ImageDetailViewViewModel
     @image_modal.hide()
 
   click_on_download: ->
+    @_track_item_action @conversation_et(), 'download', 'image' if @source is 'collection'
     @message_et().download()
 
   click_on_like: =>
+    like_action = if @message_et().is_liked() then 'unlike' else 'like'
+    @_track_item_action @conversation_et(), like_action, 'image' if @source is 'collection'
     @conversation_repository.toggle_like @conversation_et(), @message_et()
 
   click_on_delete: =>
     amplify.publish z.event.WebApp.WARNING.MODAL, z.ViewModel.ModalType.DELETE_MESSAGE,
       action: =>
+        @_track_item_action @conversation_et(), 'delete_for_me', 'image' if @source is 'collection'
         @conversation_repository.delete_message @conversation_et(), @message_et()
         @image_modal.hide()
 
   click_on_delete_for_everyone: =>
     amplify.publish z.event.WebApp.WARNING.MODAL, z.ViewModel.ModalType.DELETE_EVERYONE_MESSAGE,
       action: =>
+        @_track_item_action @conversation_et(), 'delete_for_everyone', 'image' if @source is 'collection'
         @conversation_repository.delete_message_everyone @conversation_et(), @message_et()
         @image_modal.hide()
+
+  _track_item_action: (conversation_et, action, type) ->
+    amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.COLLECTION.DID_ITEM_ACTION,
+      action: action
+      type: type
+      conversation_type: z.tracking.helpers.get_conversation_type conversation_et
+      with_bot: conversation_et.is_with_bot()
diff --git a/app/script/view_model/content/CollectionDetailsViewModel.coffee b/app/script/view_model/content/CollectionDetailsViewModel.coffee
index bad01f82fef..790a7bbac22 100644
--- a/app/script/view_model/content/CollectionDetailsViewModel.coffee
+++ b/app/script/view_model/content/CollectionDetailsViewModel.coffee
@@ -46,7 +46,7 @@ class z.ViewModel.content.CollectionDetailsViewModel
     amplify.publish z.event.WebApp.CONTENT.SWITCH, z.ViewModel.content.CONTENT_STATE.COLLECTION
 
   click_on_image: (message_et) ->
-    amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW, message_et
+    amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW, message_et, 'collection'
 
   should_show_header: (message_et) =>
     if not @last_message_timestamp?
diff --git a/app/script/view_model/content/CollectionViewModel.coffee b/app/script/view_model/content/CollectionViewModel.coffee
index 9501989cd43..00a009ed556 100644
--- a/app/script/view_model/content/CollectionViewModel.coffee
+++ b/app/script/view_model/content/CollectionViewModel.coffee
@@ -50,6 +50,7 @@ class z.ViewModel.content.CollectionViewModel
       @populate_items message_ets
       if @images().length + @files().length + @links().length is 0
         @no_items_found true
+      @_track_opened_collection conversation_et, @no_items_found()
 
   populate_items: (message_ets) =>
     for message_et in message_ets
@@ -68,5 +69,18 @@ class z.ViewModel.content.CollectionViewModel
     @collection_details.set_conversation @conversation_et(), category, [].concat items
     amplify.publish z.event.WebApp.CONTENT.SWITCH, z.ViewModel.content.CONTENT_STATE.COLLECTION_DETAILS
 
-  click_on_image: (message_et) ->
-    amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW,  message_et
+  click_on_image: (message_et) =>
+    amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW, message_et, 'collection'
+    @_track_opened_item @conversation_et(), 'image'
+
+  _track_opened_collection: (conversation_et, is_empty) ->
+    amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.COLLECTION.OPENED_COLLECTIONS,
+      is_empty: is_empty
+      conversation_type: z.tracking.helpers.get_conversation_type conversation_et
+      with_bot: conversation_et.is_with_bot()
+
+  _track_opened_item: (conversation_et, type) ->
+    amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.COLLECTION.OPENED_ITEM,
+      type: type
+      conversation_type: z.tracking.helpers.get_conversation_type conversation_et
+      with_bot: conversation_et.is_with_bot()