diff --git a/CHANGES.rst b/CHANGES.rst
index 6c9a8df23..84bf6efca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,7 @@ Changes to be released in next version
  * Xcode 12: Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated.
  * Update Gemfile.lock.
  * MXAnalyticsDelegate: Make it fully agnostic on tracked data.
+ * MXProfiler: Use this new module to track launch animation time reliably.
  * KeyValueStore improvements.
  * Jitsi: Support authenticated Jitsi widgets (#3655).
  * Room invites: Allow to accept a room invite without preview.
diff --git a/Riot/Assets/bg.lproj/InfoPlist.strings b/Riot/Assets/bg.lproj/InfoPlist.strings
index 975970644..4e548cf76 100644
--- a/Riot/Assets/bg.lproj/InfoPlist.strings
+++ b/Riot/Assets/bg.lproj/InfoPlist.strings
@@ -4,3 +4,4 @@
 "NSMicrophoneUsageDescription" = "Микрофонът се използва, за да се правят видеа и да се водят разговори.";
 "NSContactsUsageDescription" = "За да открие контакти използващи Matrix, Element може да изпрати имейл адресите и телефонните номера от телефонния указател към избрания от вас Matrix сървър за самоличност. Ако се поддържа, личните данни могат да бъдат хеширани преди изпращане - вижте политиката за поверителност на сървъра за самоличност за повече информация.";
 "NSCalendarsUsageDescription" = "Вижте насрочените срещи в приложението.";
+"NSFaceIDUsageDescription" = "Използва се Face ID за достъп до приложението.";
diff --git a/Riot/Assets/bg.lproj/Localizable.strings b/Riot/Assets/bg.lproj/Localizable.strings
index 1c91173f5..ec79b41a4 100644
--- a/Riot/Assets/bg.lproj/Localizable.strings
+++ b/Riot/Assets/bg.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Съобщение от %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Съобщение в %@";
+"MESSAGE_PROTECTED" = "Ново съобщение";
diff --git a/Riot/Assets/bg.lproj/Vector.strings b/Riot/Assets/bg.lproj/Vector.strings
index 0017c6bb2..a1bb6c3f7 100644
--- a/Riot/Assets/bg.lproj/Vector.strings
+++ b/Riot/Assets/bg.lproj/Vector.strings
@@ -339,7 +339,7 @@
 // Room Details
 "room_details_title" = "Информация";
 "room_details_people" = "Членове";
-"room_details_files" = "Файлове";
+"room_details_files" = "Качвания";
 "room_details_settings" = "Настройки";
 "room_details_photo" = "Снимка на стаята";
 "room_details_room_name" = "Име на стаята";
@@ -667,7 +667,7 @@
 "sign_out_key_backup_in_progress_alert_cancel_action" = "Ще почакам";
 // String for App Store
 "store_short_description" = "Защитен децентрализиран чат/VoIP";
-"store_full_description" = "Комуникирай по свой начин.\n\nЧат приложение, което е изцяло гъвкаво и под Ваш контрол. Element позволява да комуникирате по начина, по който искате. Направено за [matrix] - стандарт за отворена и децентрализирана комуникация.\n\nИзползвайте безплатен matrix.org акаунт, собствен сървър от https://ems.element.io или друг Matrix сървър.\n\nЗащо да изберете Element?\n\n• ПЪЛНА КОМУНИКАЦИЯ: Създавайте каквито пожелаете чат стаи - свързани с работни екипи, приятели или друг вид общности! Чатете, споделяйте файлове, добавяйте приспособления и водете аудио и видео разговори - всичко това, изцяло безплатно.\n\n• МОЩНИ ИНТЕГРАЦИИ: Използвайте Element с досега-познатите Ви инструменти. Посредством Element дори можете да чатите с потребители и групи използващи други чат приложения.\n\n• ЛИЧНО И ЗАЩИТЕНО: Пазете комуникацията си в тайна. Съвременна технология за шифроване от край до край гарантира, че Вашата комуникацията наистина остава Ваша.\n\n• ОТВОРЕНО, А НЕ ЗАТВОРЕНО: Приложение с отворен код, изградено върху Matrix. Дръжте данните си под Ваш контрол, като използвате Ваш собствен сървър или като изберете сървър, на който вярвате.\n\n• КЪДЕТО И ДА СТЕ: Поддържайте връзка където и да сте, с напълно синхронизирана чат история на всички Ваши устройства или онлайн на https://app.element.io.";
+"store_full_description" = "Element е нов тип приложение за чат и съвместна работа, което:\n\n1. Ви дава контрол и пази поверителността ви\n2. Ви позволява да комуникирате с всеки в Matrix мрежата, а дори и извън нея, интегрирайки се с други приложения (като Slack)\n3. Ви пази от реклами, събиране на данни, задни вратички и затворени екосистеми\n4. Ви защитава, чрез шифроване от-край-до-край и кръстосано-подписване за потвърждение на другите потребители\n\nElement е напълно различен от другите чат приложения, защото е децентрализиран и с отворен код.\n\nElement ви позволява да използвате собствен сървър, или да изберете сами сървъра, така че да имате поверителност, собственост и контрол върху данните и разговорите си. Дава ви достъп до отворена мрежа, за да не сте ограничени да комуникирате само с Element потребители. Също така е и много сигурен.\n\nElement успява да прави всичко това, защото използва Matrix - стандарт за отворена, децентрализирана комуникация.\n\nElement ви дава контрол, позволявайки ви сами да изберете кой стопанисва разговорите ви. От Element приложението можете да изберете между няколко различни начина:\n\n1. Регистриране на безплатен профил върху публичния matrix.org сървър\n2. Използване на изцяло собствен сървър върху ваш хардуер (self-hosting)\n3. Регистриране на профил върху собствен сървър чрез абониране към Element Matrix Services хостинг платформата\n\nЗащо да изберете Element?\n\nПАЗЕТЕ ДАННИТЕ СИ: Вие решавате къде да пазите данните и съобщенията си. Те са ваши и под ваш контрол, а не под контрола на някоя МЕГА–КОРПОРАЦИЯ, която ги обработва и предоставя за ползване на трети страни.\n\nОТВОРЕН ЧАТ И КОЛАБОРАЦИЯ: Можете да чатите с всички в Matrix мрежата, без значение дали използват Element или друго Matrix приложение. Освен това, можете да чатите и с потребители от други чат системи (като например Slack, IRC или XMPP)\n\nСУПЕР-СИГУРЕН: Истинско шифроване от-край-до-край (само тези в разговора могат да дешифрират съобщенията), както и кръстосано-подписване за потвърждение на участниците в разговорите.\n\nПЪЛНА КОМУНИКАЦИЯ: Чат, аудио и видео разговори, споделяне на екран, както и цял куп други интеграции, ботове и приспособления. Създавайте чат стаи, общности, поддържайте връзка и бъдете продуктивни.\n\nКЪДЕТО И ДА СТЕ: Поддържайте връзка където и да сте, чрез напълно синхронизирана история на съобщенията на всички ваши устройство и в уеб браузъра на https://element.io/app.";
 "auth_autodiscover_invalid_response" = "Невалиден отговор при опит за откриване на адреса на сървъра";
 "room_message_unable_open_link_error_message" = "Неуспешно отваряне на връзката.";
 "room_event_action_reply" = "Отговори";
@@ -1013,7 +1013,7 @@
 "key_verification_self_verify_unverified_sessions_alert_validate_action" = "Прегледай";
 "device_verification_self_verify_wait_title" = "Завършване на сигурността";
 "device_verification_self_verify_wait_new_sign_in_title" = "Потвърждение на вход";
-"device_verification_self_verify_wait_information" = "Потвърдете тази сесия от някоя от другите ви сесии, така че да й дадете достъп до шифрованите съобщения.\n\nИзползвайте най-новия Element на другите си устройства:";
+"device_verification_self_verify_wait_information" = "Потвърдете тази сесия от някоя от другите ви сесии, за че да й дадете достъп до шифрованите съобщения.\n\nИзползвайте най-новия Element на другите си устройства:";
 "device_verification_self_verify_wait_additional_information" = "или друг Matrix клиент поддържащ кръстосано-подписване";
 "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Използвай ключ за възстановяване";
 "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Използвай парола или ключ за възстановяване";
@@ -1133,3 +1133,150 @@
 "secrets_setup_recovery_passphrase_confirm_information" = "Въведете защитната парола отново за да потвърдите.";
 "secrets_setup_recovery_passphrase_confirm_passphrase_title" = "Потвърди";
 "secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "Потвърдете паролата";
+"room_info_list_section_other" = "Друго";
+"room_info_list_several_members" = "%@ членове";
+
+// MARK: - Room Info
+
+"room_info_list_one_member" = "1 член";
+"create_room_placeholder_address" = "#testroom:matrix.org";
+"create_room_section_header_address" = "Адрес на стаята";
+"create_room_show_in_directory" = "Показвай в директорията със стаи";
+"create_room_section_footer_type" = "Хората могат да се присъединяват към частни стаи само с покана.";
+"create_room_type_public" = "Публична стая";
+"create_room_type_private" = "Частна стая";
+"create_room_section_header_type" = "Тип стая";
+"create_room_section_footer_encryption" = "Шифроването не може да бъде изключено в последствие.";
+"create_room_enable_encryption" = "Включи шифроване";
+"create_room_section_header_encryption" = "Шифроване";
+"create_room_placeholder_topic" = "Тема";
+"create_room_section_header_topic" = "Тема на стаята (незадължително)";
+"create_room_placeholder_name" = "Име";
+"create_room_section_header_name" = "Име на стаята";
+
+// MARK: - Create Room
+
+"create_room_title" = "Нова стая";
+"searchable_directory_search_placeholder" = "Име или ID";
+"searchable_directory_x_network" = "%@ мрежа";
+
+// MARK: - Searchable Directory View Controller
+
+"searchable_directory_create_new_room" = "Създай нова стая";
+"biometrics_cant_unlocked_alert_message_retry" = "Опитай пак";
+"biometrics_cant_unlocked_alert_message_login" = "Влез отначало";
+"biometrics_cant_unlocked_alert_message_x" = "За отключване, използвайте %@ или влезте отначало и включете %@ пак";
+"biometrics_cant_unlocked_alert_title" = "Неуспешно отключване на приложението";
+"biometrics_usage_reason" = "Необходима е автентикация за да достъпите приложението";
+"biometrics_desetup_disable_button_title_x" = "Изключи %@";
+"biometrics_desetup_title_x" = "Изключване на %@";
+"biometrics_setup_title_x" = "Включване на %@";
+"biometrics_setup_subtitle" = "Спестете си време";
+"biometrics_setup_enable_button_title_x" = "Включи %@";
+"biometrics_settings_enable_x" = "Включи %@";
+"biometrics_mode_face_id" = "Face ID";
+
+// MARK: - Biometrics Protection
+
+"biometrics_mode_touch_id" = "Touch ID";
+"pin_protection_kick_user_alert_message" = "Бяхте изхвърлени от приложението поради твърде много грешки";
+"pin_protection_explanatory" = "Чрез настройката на PIN код може да защитите съобщенията и контактите така, че те да бъдат достъпни само след въвеждането на PIN код при пускането на приложението.";
+"pin_protection_not_allowed_pin" = "От съображения за сигурност, този PIN код не е позволен. Опитайте с друг";
+"pin_protection_settings_enable_pin" = "Включи PIN код";
+"pin_protection_settings_enabled_forced" = "PIN кодът е включен";
+"pin_protection_settings_section_footer" = "За да нулирате PIN кода, ще трябва да влезете наново и да създадете нов.";
+"pin_protection_settings_section_header_x" = "PIN и %@";
+"pin_protection_mismatch_too_many_times_error_message" = "Ако не помните PIN кода си, натиснете бутона за забравен PIN код.";
+"pin_protection_mismatch_error_message" = "Опитайте пак";
+"pin_protection_mismatch_error_title" = "PIN кодовете не съвпадат";
+"pin_protection_reset_alert_action_reset" = "Нулирай";
+"pin_protection_reset_alert_message" = "За да нулирате PIN кода, ще трябва да влезете наново и да създадете нов";
+"pin_protection_reset_alert_title" = "Нулирай PIN кода";
+"pin_protection_forgot_pin" = "Забравих PIN кода";
+"pin_protection_enter_pin" = "Въведете PIN код";
+"pin_protection_confirm_pin_to_disable" = "Потвърдете PIN кода за да го изключите";
+"pin_protection_confirm_pin" = "Потвърдете PIN кода";
+"pin_protection_choose_pin" = "Създайте PIN код за сигурност";
+"pin_protection_choose_pin_welcome_after_register" = "Добре дошли.";
+
+// MARK: - PIN Protection
+
+"pin_protection_choose_pin_welcome_after_login" = "Добре дошли отново.";
+"major_update_done_action" = "Разбрах";
+"major_update_learn_more_action" = "Научи повече";
+"major_update_information" = "Развълнувани сме да съобщим, че се преименувахме! Приложението ви е обновено и сте вписани в профила си.";
+
+// MARK: - Major update
+
+"major_update_title" = "Riot вече е Element";
+"cross_signing_setup_banner_subtitle" = "Потвърждавайте другите си устройства по-лесно";
+
+// MARK: - Cross-signing
+
+// Banner
+
+"cross_signing_setup_banner_title" = "Настройка на шифроване";
+"secrets_reset_authentication_message" = "Въведете паролата за профила за да потвърдите";
+"secrets_reset_reset_action" = "Нулирай";
+"secrets_reset_warning_message" = "Ще започнете отначало, без история, без съобщения, без доверени устройства и потребители.";
+"secrets_reset_warning_title" = "Ако нулирате всичко";
+"secrets_reset_information" = "Правете това само ако нямате някое друго устройство, с което да потвърдите текущото.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Нулиране на всичко";
+"secrets_recovery_reset_action_part_2" = "Нулирай всичко";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Забравихте или загубихте всички опции за възстановяване? ";
+"device_verification_self_verify_wait_recover_secrets_checking_availability" = "Проверяване за други възможности за потвърждение...";
+"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Започни използване на защитено резервно копие";
+"secure_backup_setup_banner_subtitle" = "Предотвратете загуба на достъп до шифрованите съобщения и данни";
+
+// Banner
+
+"secure_backup_setup_banner_title" = "Защитено резервно копие";
+"secure_key_backup_setup_existing_backup_error_delete_it" = "Изтрий";
+"secure_key_backup_setup_existing_backup_error_unlock_it" = "Отключи";
+"secure_key_backup_setup_existing_backup_error_info" = "Отключете за да го преизползвате в защитеното резервно копие или го изтрийте за да създадете ново резервно копие на съобщенията в защитеното резервно копие.";
+"secure_key_backup_setup_existing_backup_error_title" = "Вече има резервно копие за съобщенията";
+"event_formatter_jitsi_widget_removed_by_you" = "Премахнахте VoIP конференция";
+"event_formatter_jitsi_widget_added_by_you" = "Добавихте VoIP конференция";
+"event_formatter_widget_removed_by_you" = "Премахнахте приспособление: %@";
+
+// Events formatter with you
+"event_formatter_widget_added_by_you" = "Добавихте приспособление: %@";
+"room_details_advanced_e2e_encryption_disabled_for_dm" = "Шифроването не е включено.";
+"room_details_advanced_e2e_encryption_enabled_for_dm" = "Включено е шифроване";
+"room_details_advanced_room_id_for_dm" = "Идентификатор:";
+"room_details_no_local_addresses_for_dm" = "Няма локални адреси";
+"room_details_access_section_directory_toggle_for_dm" = "Показвай в директорията със стаи";
+"room_details_access_section_anyone_for_dm" = "Всеки знаещ връзката, включително и гости";
+"room_details_access_section_anyone_apart_from_guest_for_dm" = "Всеки знаещ връзката, освен гости";
+"room_details_access_section_for_dm" = "Кой има достъп?";
+"room_details_room_name_for_dm" = "Име";
+"room_details_photo_for_dm" = "Снимка";
+"room_details_title_for_dm" = "Подробности";
+
+// AuthenticatedSessionViewControllerFactory
+"authenticated_session_flow_not_supported" = "Приложението не поддържа механизма за вход на този сървър.";
+"security_settings_user_password_description" = "Потвърдете самоличността си като въведете паролата за профила";
+"security_settings_secure_backup_delete" = "Изтрий";
+"security_settings_secure_backup_synchronise" = "Синхронизирай";
+"security_settings_secure_backup_setup" = "Настрой";
+"security_settings_secure_backup_description" = "Предпазете се от загуба на достъп до шифровани съобщения и данни като направите резервно копие на ключовете върху сървъра.";
+"security_settings_secure_backup" = "ЗАЩИТЕНО РЕЗЕРВНО КОПИЕ";
+"security_settings_crypto_sessions_description_2" = "Ако не разпознавате даден вход, сменете паролата и нулирайте защитеното резервно копие.";
+"external_link_confirmation_message" = "Връзката %@ ви води към друг сайт %@\n\nСигурни ли сте, че искате да продължите?";
+"external_link_confirmation_title" = "Проверете тази връзка пак";
+"room_participants_security_information_room_encrypted_for_dm" = "Съобщенията тук са шифровани от-край-до-край.\n\nСъобщенията са защитени чрез заключване, за което само вие и получателите имате уникалните ключове.";
+"room_participants_security_information_room_not_encrypted_for_dm" = "Съобщенията тук не са шифровани.";
+"room_participants_filter_room_members_for_dm" = "Филтрирай членовете";
+"room_participants_leave_prompt_msg_for_dm" = "Сигурни ли сте, че искате да напуснете?";
+"room_participants_leave_prompt_title_for_dm" = "Напускане";
+"less" = "По-малко";
+"more" = "Още";
+"switch" = "Смяна";
+"joined" = "Се присъедини";
+"store_promotional_text" = "Пазещо-поверителността ви приложение за чат и съвместна работа, което е част от отворена мрежа. Децентрализирано, за да ви даде контрол. Без събиране на данни, без задни вратички и без достъп на трети страни.";
diff --git a/Riot/Assets/cs.lproj/Vector.strings b/Riot/Assets/cs.lproj/Vector.strings
index 94f37403b..ce499a826 100644
--- a/Riot/Assets/cs.lproj/Vector.strings
+++ b/Riot/Assets/cs.lproj/Vector.strings
@@ -237,3 +237,4 @@
 "auth_msisdn_validation_message" = "Odeslali jsme vám SMS aktivační kod. Prosím, zadejte jej níže.";
 "auth_msisdn_validation_error" = "Nelze ověřit telefonní číslo.";
 "auth_reset_password_success_message" = "Vaše heslo bylo úspěšně resetováno.\n\nByl jste právě odhlášen na všech vašich zařízeních a nebudete vánm nadále zasíláno oznámení. Pro znovu povolení zasílání oznámení, přihlašte se znovu na každém zařízení.";
+"store_full_description" = "Element je novým typem komunikátoru a propojovací aplikace která:\n\n1. Dává vám kontrolu nad vaším soukromím\n2. Vás nechá komunikovat s kýmkoli v Matrix síti a dokonce mimo ni, díky integrace s aplikacemi jako je například Slack\n3. Vás chrání před reklamou, těžbou Vašich dat, nechráněnými přístupy nebo nezdokumentovanými fukncemi\n4. Zabezpečuje Vaši komunikaci pomocí koncového šifrování s distribuovaným ověřením ostatních\n\nElement se liší od ostatních komunikačních řešeních především tím, že je decentralizovaný a open-source\n\nElement vám umožňuje provozovat vlastní server anebo si vybrat nějakyý z veřejných, takže máte controlu nad vašimi konverzacemi a soukromím. Dává vám přístup do otevřené sítě, takže nejste odkázání jen ke komunikaci s ostatními uživateli Elementu. A je vysoce bezpečný.\n\nElement je toho všeho schopen díky svému operačnímu protokolu - Matrix, otevřeného standartu pro decentralizovanou komunikaci.\n\nElement vás nechává vybrat, kdo bude hostovat vaše konverzace. Přímo z aplikace si můžete vybrat několik rozdílných řešení:\n\n1. Účet zdarma na veřejném serveru matrix.org\n2. Vlastní hosting serveru na vlastním hardwaru\n3. Účet na přizpůsobeném serveru jednodýúchým přihlášením na hosting Element Matrix Services\n\nProč Element?\n\nVLASTNĚTE SVÁ DATA: Vy rozhodujete kde jsou vaše data a zprávy uchovávány. Svá data vlastníte a spravujete Vy, ne nějaká obří korporace, která o vás sbírá osobní data nebo poskytuje přístup dalším stranám.\n\nOTEVŘENÁ KOMUNIKACE A SPOLUPRÁCE: Máte možnost spojit se s kýmkoli v síti Matrix bez ohledu na jeho softwarové řešení, a dokonce se můžete připojit i na jiné komunikační protokoly, jako je Slack, IRC nebo XMPP (Jabber). Komunita podporuje i komunikátory jako Whatsapp, Telegram nebo iMessage.\n\nNEPROLOMITELNÉ ŠIFROVÁNÍ: Skutečné koncové šifrování (pouze přímí účastníci konverzace mají možnost rozšifrovat jejich zprávy) a pokročilé ověřování kontaktů.\n\nVŠESTRANNÉ KOMUNIKAČNÍ MOŽNOSTI: Textové zprávy, hlasové nebo videohovory, přenos souborů, sdílení obrazovky a mnoho dalších funkcí a možností pro implementaci. Vytvářejte místnosti a komunity a zůstaňte v kontaktu.\n\nKDEKOLI SE NACHÁZÍTE: Přístup k plně synchronizované historii konverzací máte kdekoli se nacházíte, ať už z aplikace anebo webového rozhraní na https://element.io/app.";
diff --git a/Riot/Assets/de.lproj/Localizable.strings b/Riot/Assets/de.lproj/Localizable.strings
index 4a87af182..eeceaadd2 100644
--- a/Riot/Assets/de.lproj/Localizable.strings
+++ b/Riot/Assets/de.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Nachricht von %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Nachricht in %@";
+"MESSAGE_PROTECTED" = "Neue Nachricht";
diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 4e3d26db9..5de898a6d 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -733,10 +733,10 @@
 "device_verification_emoji_bell" = "Glocke";
 "device_verification_emoji_anchor" = "Anker";
 "device_verification_emoji_headphones" = "Kopfhörer";
-"close" = "Beenden";
+"close" = "Schließen";
 "auth_softlogout_signed_out" = "Du bist abgemeldet";
 "auth_softlogout_sign_in" = "Einloggen";
-"auth_softlogout_reason" = "Deine Heimserver-Administration (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.";
+"auth_softlogout_reason" = "Deine Heimserver-Administration (%1$@) hat dich von deinem Konto %2$@ (%3$@) abgemeldet.";
 "auth_softlogout_recover_encryption_keys" = "Melden dich an, um ausschließlich auf diesem Gerät gespeicherte Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten auf jedem Gerät zu lesen.";
 "auth_softlogout_clear_data" = "Persönliche Daten löschen";
 "auth_softlogout_clear_data_message_1" = "Warnung: Deine persönlichen Daten (einschließlich Verschlüsselungsschlüssel) sind noch auf diesem Gerät gespeichert.";
@@ -1227,3 +1227,18 @@
 "room_details_advanced_e2e_encryption_enabled_for_dm" = "Verschlüsselung ist hier aktiviert";
 "room_details_advanced_e2e_encryption_disabled_for_dm" = "Verschlüsselung ist hier nicht aktiviert.";
 "pin_protection_kick_user_alert_message" = "Zu viele Fehler. Du wurdest ausgeloggt";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Alles zurücksetzen";
+"secrets_recovery_reset_action_part_2" = "Alles zurücksetzen";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Wiederherstellungsoptionen vergessen oder verloren? ";
+"less" = "Weniger";
+"secrets_reset_authentication_message" = "Gib dein Konto-Passwort ein, um zu bestätigen";
+"secrets_reset_reset_action" = "Zurücksetzen";
+"secrets_reset_warning_message" = "Du wirst ohne Nachrichtenverlauf, Nachrichten, vertraute Geräte oder vertraute Benutzer neu-starten.";
+"secrets_reset_warning_title" = "Falls du alles zurücksetzt";
+"secrets_reset_information" = "Tu dies nur, wenn du kein anderes Gerät hast, mit dem du dieses Gerät überprüfen kannst.";
diff --git a/Riot/Assets/eo.lproj/Vector.strings b/Riot/Assets/eo.lproj/Vector.strings
index 9ac8363bd..3c46c59d3 100644
--- a/Riot/Assets/eo.lproj/Vector.strings
+++ b/Riot/Assets/eo.lproj/Vector.strings
@@ -6,15 +6,15 @@
 "title_rooms" = "Babilejoj";
 "title_groups" = "Komunumoj";
 "room_recents_people_section" = "HOMOJ";
-"room_recents_conversations_section" = "BABILEJOJ";
-"room_recents_no_conversation" = "Neniu babilejo";
+"room_recents_conversations_section" = "ĈAMBROJ";
+"room_recents_no_conversation" = "Neniu ĉambro";
 "search_people" = "Homoj";
 "search_files" = "Dosieroj";
 "search_default_placeholder" = "Serĉi";
 // Chat
 "room_jump_to_first_unread" = "Salti al unua nelegita mesaĝo";
-"group_details_people" = "Homoj";
-"group_details_rooms" = "Babilejoj";
+"group_details_people" = "Personoj";
+"group_details_rooms" = "Ĉambroj";
 // MARK: - Device Verification
 "device_verification_title" = "Kontroli aparaton";
 // String for App Store
@@ -86,3 +86,498 @@
 "auth_missing_phone" = "Mankanta telefonnumero";
 "auth_missing_email_or_phone" = "Mankanta retpoŝtadreso aŭ telefonnumero";
 "auth_password_dont_match" = "Pasvortoj ne kongruas";
+"room_predecessor_link" = "Tuŝetu ĉi tien por vidi pli malnovajn mesaĝojn.";
+"room_predecessor_information" = "Ĉi tiu ĉambro estas la daŭrigo de alia interparolo.";
+"room_replacement_link" = "La interparolo daŭras ĉi tie.";
+"room_replacement_information" = "Ĉi tiu ĉambro estis anstataŭigita kaj ne plu aktivas.";
+"room_action_reply" = "Respondi";
+"room_action_send_file" = "Sendi dosieron";
+"room_action_send_sticker" = "Sendi glumarkon";
+"room_action_send_photo_or_video" = "Sendi foton aŭ filmon";
+"room_action_camera" = "Foti aŭ filmi";
+"room_event_failed_to_send" = "Malsukcesis sendi";
+"room_warning_about_encryption" = "Tutvoje ĉifrado estas daŭre prilaborata, kaj eble ne fidindas.\n\nVi ne jam fidu ĝin, pri la sekurigo de datumaĵoj.\n\nAparato ne povas malĉifri historiajn mesaĝojn senditajn antaŭ sia aliĝo.\n\nĈifritaj mesaĝoj ne videblas je klientoj kiuj ne subtenas ĉifradon.";
+"room_event_action_reaction_history" = "Historio de reagoj";
+"room_event_action_reaction_show_less" = "Montri malplion";
+"room_event_action_reaction_show_all" = "Montri ĉiun";
+"room_event_action_edit" = "Redakti";
+"room_event_action_reply" = "Respondi";
+"room_event_action_view_encryption" = "Informoj pri ĉifrado";
+"room_event_action_cancel_download" = "Rezigni elŝutadon";
+"room_event_action_cancel_send" = "Rezigni sendadon";
+"room_event_action_delete" = "Forigi";
+"room_event_action_resend" = "Resendi";
+"room_event_action_save" = "Konservi";
+"room_event_action_report_prompt_ignore_user" = "Ĉu vi volas kaŝi ĉiujn mesaĝojn de ĉi tiu uzanto?";
+"room_event_action_ban_prompt_reason" = "Kialo pro forbaro de ĉi tiu uzanto";
+"room_event_action_kick_prompt_reason" = "Kialo pro forpelo de ĉi tiu uzanto";
+"room_event_action_report_prompt_reason" = "Kialo pro raporto de ĉi tiu enhavo";
+"room_event_action_report" = "Raporti enhavon";
+"room_event_action_view_decrypted_source" = "Vidi malĉifritan fonton";
+"room_event_action_view_source" = "Vidi fonton";
+"room_event_action_permalink" = "Fiksligilo";
+"room_event_action_share" = "Kunhavigi";
+"room_event_action_more" = "Pli";
+"room_event_action_redact" = "Forigi";
+"room_event_action_quote" = "Citi";
+"room_event_action_copy" = "Kopii";
+"room_delete_unsent_messages" = "Forigi nesenditajn mesaĝojn";
+"room_resend_unsent_messages" = "Resendi nesenditajn mesaĝojn";
+"room_prompt_cancel" = "rezigni ĉiun";
+"room_prompt_resend" = "Resendi ĉiun";
+"room_conference_call_no_power" = "Vi bezonas permeson administri grupvokojn en ĉi tiu ĉambro";
+"room_ongoing_conference_call_close" = "Fermi";
+"room_ongoing_conference_call" = "Daŭranta grupa voko. Aliĝi kiel %@ aŭ %@.";
+"room_unsent_messages_unknown_devices_notification" = "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj salutaĵoj. Ĉu %@ aŭ %@ nun?";
+"room_unsent_messages_notification" = "Mesaĝoj ne sendiĝis. Ĉu %@ aŭ %@ nun?";
+"room_offline_notification" = "Konekto al la servilo perdiĝis.";
+"room_accessiblity_scroll_to_bottom" = "Moviĝi ĝis planko";
+"encrypted_room_message_placeholder" = "Sendi mesaĝon ĉifritan…";
+"room_do_not_have_permission_to_post" = "Vi ne havas permeson mesaĝi en ĉi tiu ĉambro";
+"room_message_unable_open_link_error_message" = "Ne povis malfermi la ligilon.";
+"room_message_placeholder" = "Sendi mesaĝon (neĉifrita)…";
+"room_many_users_are_typing" = "%@, %@, kaj aliaj tajpas…";
+"room_two_users_are_typing" = "%@ kaj %@ tajpas…";
+"room_one_user_is_typing" = "%@ tajpas…";
+"room_new_messages_notification" = "%d novaj mesaĝoj";
+"room_new_message_notification" = "%d nova mesaĝo";
+"room_member_power_level_short_custom" = "Propra";
+"room_member_power_level_short_admin" = "Administranto";
+"room_member_power_level_custom_in" = "Propra (%@) in %@";
+"room_member_power_level_moderator_in" = "Reguligisto en %@";
+"room_member_power_level_admin_in" = "Administranto en %@";
+"room_participants_security_information_room_encrypted_for_dm" = "Mesaĝoj ĉi tie estas tutvoje ĉifrataj.\n\nViaj mesaĝoj estas sekurataj per ŝlosiloj. Vi kaj la ricevanto havas la solajn ŝlosilojn por malŝlosi ilin.";
+"room_participants_security_information_room_not_encrypted" = "Mesaĝoj en ĉi tiu ĉambro ne estas tutvoje ĉifrataj.";
+"room_participants_security_information_room_not_encrypted_for_dm" = "Mesaĝoj ĉi tie ne estas tutvoje ĉifrataj.";
+"room_participants_security_information_room_encrypted" = "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj.\n\nViaj mesaĝoj estas sekurataj per ŝlosiloj. Vi kaj la ricevanto havas la solajn ŝlosilojn por malŝlosi ilin.";
+"room_participants_action_security_status_warning" = "Averto";
+"room_participants_action_security_status_complete_security" = "Kompletigi sekurigon";
+"room_participants_action_security_status_verify" = "Kontroli";
+"room_participants_action_security_status_verified" = "Kontrolite";
+"room_participants_action_mention" = "Mencii";
+"room_participants_action_start_video_call" = "Komenci vidvokon";
+"room_participants_action_start_voice_call" = "Komenci voĉvokon";
+"room_participants_action_start_new_chat" = "Komenci novan babilon";
+"room_participants_action_set_admin" = "Igi administranto";
+"room_participants_action_set_moderator" = "Igi reguligisto";
+"room_participants_action_set_default_power_level" = "Reigi normala uzanto";
+"room_participants_action_unignore" = "Reatenti ĉiujn mesaĝojn de ĉi tiu uzanto";
+"room_participants_action_ignore" = "Malatenti ĉiujn mesaĝojn de ĉi tiu uzanto";
+"room_participants_action_unban" = "Malforbari";
+"room_participants_action_ban" = "Farbari de ĉi tiu ĉambro";
+"room_participants_action_remove" = "Forigi de ĉi tiu ĉambro";
+"room_participants_action_leave" = "Foriri de ĉi tiu ĉambro";
+"room_participants_action_invite" = "Inviti";
+"room_participants_action_section_security" = "Sekureco";
+"room_participants_action_section_other" = "Agordoj";
+"room_participants_action_section_devices" = "Salutaĵoj";
+"room_participants_action_section_direct_chats" = "Rektaj ĉambroj";
+"room_participants_action_section_admin_tools" = "Administriloj";
+"room_participants_now" = "nun";
+"room_participants_ago" = "antaŭ";
+"room_participants_idle" = "Senage";
+"room_participants_unknown" = "Nekonata";
+"room_participants_invite_prompt_msg" = "Ĉu vi certe volas inviti uzanton %@ al ĉi tiu ĉambro?";
+"room_participants_remove_prompt_msg" = "Ĉu vi certe volas forigi uzanton %@ de ĉi tiu ĉambro?";
+"room_participants_offline" = "Eksterrete";
+"room_participants_online" = "Enrete";
+"room_participants_start_new_chat_error_using_user_email_without_identity_server" = "Neniu identiga servilo estas agordita, do vi ne povas komenci babilon kun kontakto uzante retpoŝtadreson.";
+"room_participants_invited_section" = "INVITITA";
+"room_participants_invite_malformed_id" = "Misformita identigilo. Ĝi devus esti retpoŝtadreso aŭ identigilo de Matrix, kiel «@lokaparto:retnomo»";
+"room_participants_invite_malformed_id_title" = "Eraris invitanta";
+"room_participants_invite_another_user" = "Serĉi / inviti laŭ identigilo, nomo, aŭ retpoŝtadreso";
+"room_participants_filter_room_members" = "Filtri ĉambranojn";
+"room_participants_invite_prompt_title" = "Konfirmo";
+"room_participants_remove_third_party_invite_prompt_msg" = "Ĉu vi certe volas senvalidigi ĉi tiun inviton?";
+"room_participants_remove_prompt_title" = "Konfirmo";
+"room_participants_leave_prompt_msg_for_dm" = "Ĉu vi certe volas foriri?";
+"room_participants_leave_prompt_msg" = "Ĉu vi certe volas foriri de la ĉambro?";
+"room_participants_leave_prompt_title_for_dm" = "Foriri";
+"room_participants_leave_prompt_title" = "Foriri de ĉambro";
+"room_participants_multi_participants" = "%d partoprenantoj";
+"room_participants_one_participant" = "1 partoprenanto";
+
+// Chat participants
+"room_participants_title" = "Partoprenantoj";
+"contacts_user_directory_section" = "KATALOGO DE UZANTOJ";
+"contacts_address_book_permission_required" = "Bezonas permeson aliri lokajn kontaktojn";
+"contacts_address_book_no_contact" = "Neniu loka kontakto";
+"contacts_address_book_no_identity_server" = "Neniu identiga servilo estas agordita";
+"contacts_address_book_matrix_users_toggle" = "Matrix uzantoj sole";
+
+// Contacts
+"contacts_address_book_section" = "LOKAJ KONTAKTOJ";
+"directory_search_fail" = "Malsukcesis akiri datumaĵojn";
+"directory_searching_title" = "Serĉante tra katalogo…";
+"directory_search_results" = "%tu rezultoj trovitaj laŭ %@";
+"directory_search_results_more_than" = ">%tu rezultoj trovitaj laŭ %@";
+"directory_search_results_title" = "Foliumi katalogajn rezultojn";
+"directory_cell_description" = "%tu ĉambroj";
+
+// Directory
+"directory_cell_title" = "Foliumi katalogon";
+"search_in_progress" = "Serĉante…";
+"search_no_result" = "Neniu rezulto";
+"search_people_placeholder" = "Serĉi laŭ identigilo, nomo, aŭ retpoŝtadreso";
+"search_messages" = "Mesaĝoj";
+
+// Search
+"search_rooms" = "Ĉambroj";
+"group_section" = "KOMUNUMOJ";
+
+// Groups tab
+"group_invite_section" = "INVITOJ";
+
+// Rooms tab
+"room_directory_no_public_room" = "Neniuj publikaj ĉambroj disponeblas";
+"people_no_conversation" = "Neniu interparolo";
+"people_conversation_section" = "INTERPAROLOJ";
+
+// People tab
+"people_invites_section" = "INVITOJ";
+"room_recents_join_room_prompt" = "Entajpu identigilon de ĉambro aŭ kromnomon de ĉambro";
+"room_recents_join_room_title" = "Aliĝi al ĉambro";
+"room_recents_join_room" = "Aliĝi al ĉambro";
+"room_recents_create_empty_room" = "Krei ĉambron";
+"room_recents_start_chat_with" = "Komenci babilon";
+"room_recents_invites_section" = "INVITOJ";
+"room_recents_server_notice_section" = "SISTEMAJ AVERTOJ";
+"room_recents_low_priority_section" = "MALALTA PRIORITATO";
+"room_recents_favourites_section" = "ELSTARIGITAJ";
+"room_recents_directory_section_network" = "Reto";
+
+// Room recents
+"room_recents_directory_section" = "KATALOGO DE ĈAMBROJ";
+"room_creation_error_invite_user_by_email_without_identity_server" = "Neniu identiga servilo estas agordita, do vi ne povas aldoni uzanton per retpoŝtadreso.";
+"room_creation_invite_another_user" = "Serĉi / inviti uzanton laŭ identigilo, nomo, aŭ retpoŝtadreso";
+"room_creation_wait_for_creation" = "Ĉambro jam estas kreata. Bonvolu atendi.";
+"room_creation_keep_private" = "Ðaŭri private";
+"room_creation_make_private" = "Privatigi";
+"room_creation_appearance_picture" = "Bildo de babilo (laŭplaĉe)";
+"room_creation_make_public_prompt_msg" = "Ĉu vi certe volas publikigi ĉi tiun ĉambron? Iu ajn povus aliĝi kaj legi viajn mesaĝojn.";
+"room_creation_make_public_prompt_title" = "Publikigi ĉi tiun ĉambron?";
+"room_creation_make_public" = "Publikigi";
+"room_creation_public_room" = "Ĉi tiu ĉambro estas publika";
+"room_creation_private_room" = "Ĉi tiu ĉambro estas privata";
+"room_creation_privacy" = "Privateco";
+"room_creation_appearance_name" = "Nomo";
+"room_creation_appearance" = "Aspekto";
+"room_creation_account" = "Konto";
+
+// Chat creation
+"room_creation_title" = "Nova babilo";
+
+// Errors
+"error_user_already_logged_in" = "Ŝajnas, ke vi provas konektiĝi al alia hejmservilo. Ĉu vi volas adiaŭi?";
+"auth_softlogout_clear_data_sign_out_msg" = "Ĉu vakigi ĉiujn datumojn nun deponitajn en ĉi tiu aparato? Resalutu por aliri al la datumoj kaj mesaĝoj de via konto.";
+"auth_softlogout_clear_data_sign_out" = "Adiaŭi";
+"auth_softlogout_clear_data_sign_out_title" = "Ĉu vi certas?";
+"auth_softlogout_clear_data_button" = "Vakigi ĉiujn datumojn";
+"auth_softlogout_clear_data_message_2" = "Vakigu ilin, se vi ne plu uzados ĉi tiun aparaton, aŭ se vi volas saluti alian konton.";
+"auth_softlogout_clear_data_message_1" = "Averto: Viaj personaj datumoj (inkluzive ĉifrajn ŝlosilojn) ankoraŭ estas deponitaj en ĉi tiu aparato.";
+"auth_softlogout_clear_data" = "Vakigi personajn datumojn";
+"auth_softlogout_recover_encryption_keys" = "Salutu por rehavi ĉifrajn ŝlosilojn deponitajn nur en ĉi tiu aparato. Vi bezonas ilin por legi ĉiujn viajn sekurajn mesaĝojn per iu ajn aparato.";
+"auth_softlogout_reason" = "La administranto de via hejmservilo (%1$@) vin adiaŭigis de via konto «%2$@» (%3$@).";
+"auth_softlogout_sign_in" = "Saluti";
+"auth_softlogout_signed_out" = "Vi estas adiaŭita";
+"auth_autodiscover_invalid_response" = "Nevalidas hejmservil-serĉanta respondo";
+"auth_accept_policies" = "Bonvolu tralegi kaj akcepti la politikojn de ĉi tiu hejmservilo:";
+"auth_add_email_and_phone_warning" = "Registriĝo per retpoŝtadreso kaj telefonnumero samtempe ankoraŭ ne estas subtenata, ĝis la «API» ekekzistos. Nur la telefonnumero estos konsiderata. Vi povas aldoni vian retpoŝtadreson al via profilo en agordoj.";
+"auth_reset_password_success_message" = "Via pasvorto restariĝis.\n\nVi adiaŭis ĉiujn viajn salutaĵojn kaj ne plu ricevos pasivajn sciigojn. Por reŝalti sciigojn, resalutu ĉiun vian aparaton.";
+"auth_reset_password_error_is_required" = "Neniu identiga servilo estas agordita: agordu servilon ĉe servilaj agordoj, por rehavo de konto.";
+"auth_reset_password_error_not_found" = "Via retpoŝtadreso ŝajne ne estas ligita al Matrix konto, je ĉi tiu hejmservilo.";
+"auth_reset_password_error_unauthorized" = "Malsukcesis kontroli retpoŝtadreson: certiĝu, ke vi klakis la ligilon en la retletero";
+"auth_reset_password_next_step_button" = "Mi kontrolis mian retpoŝtadreson";
+"auth_reset_password_email_validation_message" = "Retletero sendiĝis al %@. Vizitinte la enhavitan ligilon, klaku sube.";
+"auth_reset_password_missing_password" = "Necesas enigi novan pasvorton.";
+"auth_reset_password_missing_email" = "Necesas enigi la retpoŝtadreson ligitan al via konto.";
+"auth_reset_password_message" = "Por restarigi vian pasvorton, enigu la retpoŝtadreson ligitan al via konto:";
+"auth_recaptcha_message" = "Ĉi tiu hejmservilo volas certiĝi, ke vi ne estas roboto";
+"auth_msisdn_validation_error" = "Ne povis kontroli telefonnumeron.";
+"auth_msisdn_validation_message" = "Ni sendis SMS-mesaĝon kun aktiviga kodo. Bonvolu enigu la kodon ĉi-suben.";
+"auth_msisdn_validation_title" = "Atendante kontrolon";
+"auth_email_validation_message" = "Bonvolu kontroli vian retpoŝton por daŭrigi la registriĝon";
+"auth_use_server_options" = "Uzi proprajn agordojn pri servilo (altnivele)";
+"auth_email_not_found" = "Malsukcesis sendi retpoŝtmesaĝon: Ĉi tiu retpoŝtadreso ne troviĝis";
+"auth_forgot_password_error_no_configured_identity_server" = "Neniu identiga servilo estas agordita: agordu servilon, por rehavo de konto.";
+"auth_forgot_password" = "Ĉu vi forgesis pasvorton?";
+"auth_username_in_use" = "Uzantonomo jam uziĝas";
+"auth_untrusted_id_server" = "La identiga servilo ne estas fidata";
+"auth_phone_is_required" = "Neniu identiga servilo estas agordita, do vi ne povas agordi telefonnumeron por laŭbezona rehavo de konto.";
+"auth_email_is_required" = "Neniu identiga servilo estas agordita, do vi ne povas agordi retpoŝtadreson por laŭbezona rehavo de konto.";
+"auth_phone_in_use" = "Ĉi tiu telefonnumero jam estas uzata.";
+"auth_email_in_use" = "Ĉi tiu retpoŝtadreso jam estas uzata";
+"auth_add_email_phone_message_2" = "Agordu retpoŝtadreson por rehavo de konto. Uzu poste retpoŝtadreson aŭ telefonon por esti laŭplaĉe trovebla de personoj, kiuj vin konas.";
+"auth_add_phone_message_2" = "Agordu telefonon, por via (laŭplaĉa) trovebleco de personoj, kiuj vin konas.";
+"auth_add_email_message_2" = "Agordu retpoŝtadreson por rehavo de konto, kaj por via (laŭplaĉa) trovebleco de personoj, kiuj vin konas.";
+"joined" = "Aliĝita";
+"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Uzi rehavajn pasfrazon aŭ ŝlosilon";
+"device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Uzi rehavan ŝlosilon";
+"device_verification_self_verify_wait_additional_information" = "aŭ alian klienton de Matrix kapablan je delegaj subskriboj";
+"device_verification_self_verify_wait_information" = "Kontrolu ĉi tiun saluton per unu el viaj aliaj salutaĵoj, dononte al ĝi aliron al ĉifritaj mesaĝoj.\n\nUzu la plej freŝan version de Element per viaj aliaj aparatoj:";
+"device_verification_self_verify_wait_new_sign_in_title" = "Kontroli ĉi tiun saluton";
+
+// MARK: Self verification wait
+
+"device_verification_self_verify_wait_title" = "Plena sekureco";
+"key_verification_self_verify_unverified_sessions_alert_validate_action" = "Kontroli";
+"key_verification_self_verify_unverified_sessions_alert_message" = "Kontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj sekuras.";
+"key_verification_self_verify_current_session_alert_validate_action" = "Kontroli";
+"key_verification_self_verify_current_session_alert_message" = "Aliaj uzantoj ĝin eble ne fidos.";
+
+// Current session
+
+"key_verification_self_verify_current_session_alert_title" = "Kontrolu ĉi tiun salutaĵon";
+"device_verification_self_verify_start_waiting" = "Atendante…";
+"device_verification_self_verify_start_information" = "Uzu ĉi tiun salutaĵon por kontroli vian novan, dononte al ĝi aliron al ĉifritaj mesaĝoj.";
+"device_verification_self_verify_start_verify_action" = "Komenci kontrolon";
+"device_verification_self_verify_alert_validate_action" = "Kontroli";
+"device_verification_self_verify_alert_message" = "Kontrolu la novan saluton alirantan al via konto: %@";
+
+// MARK: Self verification start
+
+// New login
+"device_verification_self_verify_alert_title" = "Nova saluto. Ĉu tio estis vi?";
+"device_verification_start_use_legacy_action" = "Uzi malnovecan kontrolon";
+"device_verification_start_verify_button" = "Komenci kontrolon";
+"device_verification_start_use_legacy" = "Ĉu nenio aperas? Ankoraŭ ne ĉiuj klientoj subtenas interagan kontroladon. Uzu kontroladon malnovecan.";
+"device_verification_start_wait_partner" = "Atendante akcepton de kunulo…";
+
+// MARK: Start
+"device_verification_start_title" = "Kontrolu per komparo de mallonga tekstoĉeno";
+"device_verification_incoming_description_2" = "Kontrolo de ĉi tiu salutaĵo markos ĝin fidata, kaj markos ankaŭ vian salutaĵon fidata por la kunulo.";
+"secure_key_backup_setup_intro_use_security_key_title" = "Uzi Sekurecan ŝlosilon";
+"secure_key_backup_setup_intro_info" = "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj per savkopiado de ŝlosiloj al via servilo.";
+"rerequest_keys_alert_message" = "Bonvolu ruli Elementon per alia aparato, kiu povas malĉifri la mesaĝon, por ke ĝi povu resendi la ŝlosilojn al ĉi tiu salutaĵo.";
+
+// Re-request confirmation dialog
+"rerequest_keys_alert_title" = "Peto sendiĝis";
+"deactivate_account_password_alert_message" = "Por daŭrigi, bonvolu enigi vian pasvorton";
+"deactivate_account_password_alert_title" = "Malaktivigi konton";
+"deactivate_account_validate_action" = "Malaktivigi konton";
+"deactivate_account_forget_messages_information_part3" = ": ĉi tio prezentos neplenajn interparolojn al estontaj uzantoj)";
+"deactivate_account_forget_messages_information_part2_emphasize" = "Averto";
+"deactivate_account_forget_messages_information_part1" = "Bonvolu forgesi ĉiujn mesaĝojn, kiujn mi sendis, je la malaktivigo de mia konto (";
+"deactivate_account_informations_part5" = "Se vi volus, ke ni forgesu viajn mesaĝojn, bonvolu marki la markbutonon sube.\n\nVidebleco de mesaĝoj en Matrix estas simila al retpoŝto. Nia forgeso de viaj mesaĝoj signifas, ke viaj senditaj mesaĝoj estos havigotaj al neniuj novaj aŭ neregistritaj uzantoj, sed uzantoj registritaj, kiuj jam povas aliri tiujn mesaĝojn, daŭre povos aliri sian kopion.";
+"deactivate_account_informations_part4_emphasize" = "implice ne forgesigas la mesaĝojn, kiujn vi sendis. ";
+"deactivate_account_informations_part3" = "\n\nMalaktivigante vian konton ";
+"deactivate_account_informations_part2_emphasize" = "Tiu ĉi ago ne malfareblas.";
+"deactivate_account_informations_part1" = "Ĉi tio igos vian konton por ĉiam neuzebla. Vi ne povos saluti, kaj neniu povos registri la saman identigilon de uzanto. Tio ĉi foririgos vian konton de ĉiuj partoprenataj ĉambroj, kaj forigos detalojn pri via konto de via identiga servilo. ";
+
+// Deactivate account
+
+"deactivate_account_title" = "Malaktivigi konton";
+"service_terms_modal_policy_checkbox_accessibility_hint" = "Kontrolu por akcepti %@";
+"service_terms_modal_message_identity_server" = "Akceptu la uzokondiĉojn de la identiga servilo (%@) por trovi kontaktojn.";
+
+// Service terms - Variant for identity server when displayed out of a context
+"service_terms_modal_title_identity_server" = "Trovado de kontaktoj";
+"service_terms_modal_description_for_integration_manager" = "Uzu robotojn, pontojn, fenestraĵojn kaj glumarkarojn";
+"service_terms_modal_description_for_identity_server_2" = "Troviĝu per telefono au retpoŝtadreso";
+"service_terms_modal_description_for_identity_server_1" = "Trovi aliajn per telefono aŭ retpoŝtadreso";
+"service_terms_modal_decline_button" = "Rifuzi";
+"service_terms_modal_accept_button" = "Akcepti";
+"service_terms_modal_message" = "Por daŭrigi, vi devas akcepti la uzokondiĉojn de ĉi tiu servo (%@).";
+
+// Service terms
+"service_terms_modal_title" = "Uzokondiĉoj";
+"gdpr_consent_not_given_alert_review_now_action" = "Tralegi nun";
+
+// GDPR
+"gdpr_consent_not_given_alert_message" = "Por daŭre uzadi la hejmservilon %@, vi devas tralegi kaj konsenti la uzokondiĉojn.";
+"e2e_room_key_request_ignore_request" = "Malatenti peton";
+"e2e_room_key_request_share_without_verifying" = "Havigi sen kontrolo";
+"e2e_room_key_request_start_verification" = "Komenci kontrolon…";
+"e2e_room_key_request_message" = "Via nekontrolita salutaĵo «%@» petas ĉifrajn ŝlosilojn.";
+"e2e_room_key_request_message_new_device" = "Vi aldonis novan salutaĵon «%@», kiu petas ĉifrajn ŝlosilojn.";
+
+// Room key request dialog
+"e2e_room_key_request_title" = "Peto de ĉifra ŝlosilo";
+"share_extension_failed_to_encrypt" = "Malsukcesis sendi. Kontrolu agordojn de ĉifrado de ĉi tiu ĉambro per la ĉefa aplikaĵo";
+
+// Share extension
+"share_extension_auth_prompt" = "Salutu la ĉefan aplikaĵon por havigi enhavon";
+"room_widget_permission_room_id_permission" = "Identigilo de ĉambro";
+"room_widget_permission_widget_id_permission" = "Identigilo de fenestraĵo";
+"room_widget_permission_theme_permission" = "Via haŭto";
+"room_widget_permission_user_id_permission" = "Via identigilo de uzanto";
+"room_widget_permission_avatar_url_permission" = "URL de via profilbildo";
+"room_widget_permission_display_name_permission" = "Via prezenta nomo";
+"room_widget_permission_creator_info_title" = "Ĉi tiun fenestraĵon aldonis:";
+
+// Room widget permissions
+"room_widget_permission_title" = "Enlegi fenestraĵon";
+"widget_picker_manage_integrations" = "Administri kunigojn…";
+
+// Widget Picker
+"widget_picker_title" = "Kunigoj";
+"widget_integration_manager_disabled" = "Vi bezonas ŝalti kunigilon en la agordoj";
+"widget_integration_room_not_visible" = "Ĉambro %@ ne videblas.";
+"widget_integration_missing_user_id" = "Mankas user_id en la peto.";
+"widget_integration_missing_room_id" = "Mankas room_id en la peto.";
+"widget_integration_no_permission_in_room" = "Vi ne havas permeson fari tion en ĉi tiu ĉambro.";
+"widget_integration_must_be_in_room" = "Vi ne estas en ĉi tiu ĉambro.";
+"widget_integration_positive_power_level" = "Povnivelo devas esti plusa entejro.";
+"widget_integration_room_not_recognised" = "Ĉi tiu ĉambro ne estas rekonita.";
+"widget_integration_failed_to_send_request" = "Malsukcesis sendi peton.";
+"widget_integration_unable_to_create" = "Ne povas krei fenestraĵon.";
+
+// Widget Integration Manager
+"widget_integration_need_to_be_able_to_invite" = "Vi bezonas rajton inviti uzantojn por tion fari.";
+"widget_menu_remove" = "Nuligi por ĉiuj";
+"widget_menu_revoke_permission" = "Nuligi mian aliron";
+"widget_menu_open_outside" = "Malfermi per foliumilo";
+"widget_menu_refresh" = "Aktualigi";
+"widget_sticker_picker_no_stickerpacks_alert_add_now" = "Ĉu aldoni iun nun?";
+"widget_sticker_picker_no_stickerpacks_alert" = "Vi nun havas neniun ŝaltitan glumarkaron.";
+"widget_creation_failure" = "Malsukcesis krei finestraĵon";
+"widget_no_power_to_manage" = "Vi bezonas permeson administri fenestraĵojn en ĉi tiu ĉambro";
+"widget_integrations_server_failed_to_connect" = "Malsukcesis konektiĝi al la kuniga servilo";
+
+// Widget
+"widget_no_integrations_server_configured" = "Neniu kuniga servilo estas agordita";
+"bug_report_send" = "Sendi";
+"bug_report_progress_uploading" = "Alŝutante raporton";
+"bug_report_progress_zipping" = "Kolektante protokolon";
+"bug_report_send_screenshot" = "Sendi ekrankopion";
+"bug_report_send_logs" = "Sendi protokolon";
+"bug_report_logs_description" = "Por diagnozi problemojn, protokolo de tiu ĉi kliento sendiĝos kun ĉi tiu raporto de eraro. Se vi preferus sendi nur la ĉi-supran tekston, bonvolu malmarki:";
+"bug_crash_report_description" = "Bonvolu priskribi, kion vi faris antaŭ la fiasko:";
+"bug_crash_report_title" = "Raporto de fiasko";
+"bug_report_description" = "Bonvolu priskribi la eraron. Kion vi faris? Kion vi atendis? Kio vere okazis?";
+
+// Bug report
+"bug_report_title" = "Raporto de eraro";
+"e2e_key_backup_wrong_version_button_wasme" = "Tio estis mi";
+"e2e_key_backup_wrong_version_button_settings" = "Agordoj";
+"e2e_need_log_in_again" = "Vi bezonas resaluti por estigi tutvoje ĉifrajn ŝlosilojn porĉi tiu salutaĵo, kaj sendi la publikan ŝlosilon al via hejmservilo.\nTio necesas nur unufoje; pardonu la ĝenon.";
+
+// Crypto
+"e2e_enabling_on_app_update" = "Element nun subtenas tutvojan ĉifradon, sed vi bezonas resaluti por ŝalti ĝin.\n\nVi povas fari tion nun, aŭ pli poste per agordoj de la aplikaĵo.";
+
+// Crash report
+"google_analytics_use_prompt" = "Ĉu vi volus nin helpi pri plibonigoj al %@ per memaga kaj sennoma raportado de fiaskoj kaj datumoj pri uzado?";
+"no_voip" = "%@ vin vokas, sed %@ ankoraŭ ne subtenas vokojn.\nVi povas malatenti ĉi tiun sciigon kaj respondi la vokon per alia aparato, aŭ vi povas ĝin rifuzi.";
+
+// No VoIP support
+"no_voip_title" = "Envena voko";
+"call_no_stun_server_error_use_fallback_button" = "Provi uzi %@";
+"call_no_stun_server_error_message_2" = "Alternative, provu uzi la publikan servilon je %@, sed tio ne estos same dependebla, kaj konigos vian IP-adreson al tiu servilo. Vi ankaŭ povas ĉi tion pritrakti per la Agordoj";
+"call_no_stun_server_error_message_1" = "Bonvolu peti la administranton de via hejmservilo %@ agordi TURN-servilon, por ke vokoj funkciu dependeble.";
+"call_no_stun_server_error_title" = "Voko malsukcesis pro misagordita servilo";
+"call_jitsi_error" = "Malsukcesis aliĝi al la grupa voko.";
+"call_already_displayed" = "Jam progresas voko.";
+"call_incoming_video" = "Envena vidvoko…";
+"call_incoming_voice" = "Envena voko…";
+"call_incoming_video_prompt" = "Envena vidvoko de %@";
+
+// Call
+"call_incoming_voice_prompt" = "Envena voĉvoko de %@";
+"room_does_not_exist" = "%@ ne ekzistas";
+"camera_unavailable" = "Ĉi tiu filmilo estas nedisponebla per via aparato";
+"camera_access_not_granted" = "%@ ne havas permeson uzi la filmilon; bonvolu ŝanĝi la agordojn pri privateco";
+"do_not_ask_again" = "Ne plu demandi";
+"rage_shake_prompt" = "Ŝajnas, ke vi kolere skuas la telefonon. Ĉu vi deziras raporti eraron?";
+"bug_report_prompt" = "La aplikaĵo lastafoje fiaskis. Ĉu vi deziras sendi raporton pri la fiasko?";
+"public_room_section_title" = "Publikaj ĉambroj (de %@):";
+"homeserver_connection_lost" = "Ne povis konektiĝi al la hejmservilo.";
+"network_offline_prompt" = "La retkonekto ŝajnas ne funkcii.";
+"yesterday" = "Hieraŭ";
+"today" = "Hodiaŭ";
+"you" = "Vi";
+
+// Others
+"or" = "aŭ";
+"event_formatter_jitsi_widget_removed_by_you" = "Vi forigis grupan vokon";
+"event_formatter_jitsi_widget_added_by_you" = "Vi aldonis grupan vokon";
+"event_formatter_widget_removed_by_you" = "Vi forigis la fenestraĵon: %@";
+
+// Events formatter with you
+"event_formatter_widget_added_by_you" = "Vi aldonis la fenestraĵon: %@";
+"event_formatter_message_edited_mention" = "(redaktite)";
+"event_formatter_rerequest_keys_part2" = " de aliaj viaj salutaĵoj.";
+"event_formatter_rerequest_keys_part1_link" = "Repeti ĉifrajn ŝlasilojn";
+"event_formatter_jitsi_widget_removed" = "Grupan vokon forigis %@";
+"event_formatter_jitsi_widget_added" = "Grupan vokon aldonis %@";
+"event_formatter_widget_removed" = "Fenestraĵon %@ forigis %@";
+"event_formatter_widget_added" = "Fenestraĵon %@ aldonis %@";
+
+// Events formatter
+"event_formatter_member_updates" = "%tu ŝanĝoj de aneco";
+"directory_server_placeholder" = "matrix.org";
+"directory_server_type_homeserver" = "Entajpu hejmservilon, kies publikaj ĉambroj listiĝu";
+"directory_server_all_rooms" = "Ĉiuj ĉambroj de la servilo %@";
+"directory_server_picker_title" = "Elektu katalogon";
+
+// Directory
+"directory_title" = "Katalogo";
+
+// Image picker
+"image_picker_action_camera" = "Foti";
+"media_picker_select" = "Elekti";
+"receipt_status_read" = "Legite: ";
+
+// Read Receipts
+"read_receipts_list" = "Listo de legokonfirmoj";
+
+// Group rooms
+"group_rooms_filter_rooms" = "Filtri ĉambrojn de komunumo";
+"group_participants_invited_section" = "INVITITAJ";
+"group_participants_invite_malformed_id" = "Misformita identigilo. Ĝi devus esti identigilo de Matrix, kiel «@lokaparto:retnomo»";
+"group_participants_invite_malformed_id_title" = "Eraris invito";
+"group_participants_invite_another_user" = "Serĉi / Inviti per identigilo de uzanto aŭ nomo";
+"group_participants_filter_members" = "Filtri komunumanojn";
+"group_participants_invite_prompt_msg" = "Ĉu vi certe volas inviti uzanton %@ al ĉi tiu grupo?";
+"group_participants_invite_prompt_title" = "Konfirmo";
+"group_participants_remove_prompt_msg" = "Ĉu vi certe volas forigi partoprenanton %@ de ĉi tiu grupo?";
+"group_participants_remove_prompt_title" = "Konfirmo";
+"group_participants_leave_prompt_msg" = "Ĉu vi certe volas foriri de la grupo?";
+"group_participants_leave_prompt_title" = "Foriri de grupo";
+
+// Group participants
+"group_participants_add_participant" = "Aldoni partoprenanton";
+"group_invitation_format" = "%@ vin invitis al ĉi tiu komunumo";
+"group_home_multi_rooms_format" = "%tu ĉambroj";
+"group_home_one_room_format" = "1 ĉambro";
+"group_home_multi_members_format" = "%tu komunumanoj";
+
+// Group Home
+"group_home_one_member_format" = "1 komunumano";
+"group_details_home" = "Hejmo";
+
+// Group Details
+"group_details_title" = "Detaloj pri Komunumo";
+"room_details_copy_room_url" = "Kopii URL-on de ĉambro";
+"room_details_copy_room_address" = "Kopii adreson de ĉambro";
+"room_details_copy_room_id" = "Kopii identigilon de ĉambro";
+"room_details_unset_main_address" = "Malagordi kiel ĉefadreson";
+"key_backup_setup_passphrase_passphrase_valid" = "Bone!";
+"key_backup_setup_passphrase_passphrase_placeholder" = "Enigu pasfrazon";
+"key_backup_setup_passphrase_info" = "Ni deponos ĉifritan kopion de viaj ŝlosiloj en nia servilo. Protektu vian savkopion per pasfrazo por ĝin sekurigi.\n\nPor plej bona sekureco, la pasfrazo malsamu la pasvorton de via konto.";
+"key_backup_setup_intro_manual_export_action" = "Permane elporti ŝlosilojn";
+"key_backup_setup_intro_info" = "Mesaĝoj en ĉifritaj ĉambroj estas sekurigitaj per tutvoja ĉifrado. Nur vi kaj la adresato(j) havas la ŝlosilojn por legi ĉi tiujn mesaĝojn.\n\nSekure savkopiu viajn ŝlosilojn por ilin ne perdi.";
+
+// Intro
+
+"key_backup_setup_intro_title" = "Neniam perdu ĉifritajn mesaĝojn";
+"key_backup_setup_skip_alert_skip_action" = "Preterpasi";
+"key_backup_setup_skip_alert_message" = "Vi eble perdos sekurajn mesaĝojn se vi adiaŭos, aŭ se vi perdos vian aparaton.";
+"key_backup_setup_skip_alert_title" = "Ĉu vi certas?";
+"secure_backup_setup_banner_subtitle" = "Evitu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj";
+
+// Banner
+
+"secure_backup_setup_banner_title" = "Sekura savkopiado";
+"secure_key_backup_setup_cancel_alert_message" = "Se vi nuligos nun, vi povos perdi ĉifritajn mesaĝojn kaj datumojn, se vi perdos aliron al viaj salutoj.\n\nVi ankaŭ povas agordi sekuran savkopiadon kaj administri viajn ŝlosilojn en Agordoj.";
+
+
+// Cancel
+
+"secure_key_backup_setup_cancel_alert_title" = "Ĉu vi certas?";
+"secure_key_backup_setup_existing_backup_error_delete_it" = "Forigi ĝin";
+"secure_key_backup_setup_existing_backup_error_unlock_it" = "Malŝlosi ĝin";
+"secure_key_backup_setup_existing_backup_error_info" = "Malŝlosu ĝin por reuzi ĝin en la sekura savkopio, aŭ forigu ĝin por fari novan savkopion de mesaĝoj en la sekura savkopio.";
+"secure_key_backup_setup_existing_backup_error_title" = "Savkopio de mesaĝoj jam ekzistas";
+"secure_key_backup_setup_intro_use_security_passphrase_info" = "Enigu sekurecan pasfrazon, kiun konas nur vi, kaj estigu ŝlosilon por la savkopio.";
+"secure_key_backup_setup_intro_use_security_passphrase_title" = "Uzi sekurecan pasfrazon";
+"secure_key_backup_setup_intro_use_security_key_info" = "Estigu sekurecan ŝlosilon konservotan en sekura loko, ekzemple mastrumilo de pasvortoj aŭ sekurkesto.";
diff --git a/Riot/Assets/et.lproj/InfoPlist.strings b/Riot/Assets/et.lproj/InfoPlist.strings
index d9bbc3958..df3ae7fb3 100644
--- a/Riot/Assets/et.lproj/InfoPlist.strings
+++ b/Riot/Assets/et.lproj/InfoPlist.strings
@@ -4,4 +4,4 @@
 "NSMicrophoneUsageDescription" = "Mikrofoni kasutatakse videote salvestamisel ning kõnede tegemisel.";
 "NSCalendarsUsageDescription" = "Vaata päevakavasse lisatud koosolekuid vastvast rakendusest.";
 "NSContactsUsageDescription" = "Selleks, et leida Matrixi võrgu kasutajaid, võib Element saata sinu aadressiraamatus leiduvad e-posti aadressid ja telefoninumbrid sinu valitud Matrixi isikutuvastusserverile. Kui server seda toetab, siis andmed muudetakse enne saatmist räsideks - täpsema teabe leiad oma isikutuvastusserveri privaatsuspoliitikast.";
-"NSFaceIDUsageDescription" = "Ligipääsuks sinu rakendusele on kasutuses Face ID.";
+"NSFaceIDUsageDescription" = "Ligipääsuks sinu rakendusele on kasutusel Face ID.";
diff --git a/Riot/Assets/et.lproj/Localizable.strings b/Riot/Assets/et.lproj/Localizable.strings
index ce762a537..8fe3f8730 100644
--- a/Riot/Assets/et.lproj/Localizable.strings
+++ b/Riot/Assets/et.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "VOICE_CONF_NAMED_FROM_USER" = "Rühmakõne kasutajalt %@: „%@“";
 /* Incoming named video conference invite from a specific person */
 "VIDEO_CONF_NAMED_FROM_USER" = "Video rühmakõne kasutajalt %@: „%@“";
+"MESSAGE_PROTECTED" = "Uus sõnum";
diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
index fe7e9d4f5..22f96c2e9 100644
--- a/Riot/Assets/et.lproj/Vector.strings
+++ b/Riot/Assets/et.lproj/Vector.strings
@@ -98,7 +98,7 @@
 "auth_autodiscover_invalid_response" = "Vigane koduserveri tuvastamise päringu vastus";
 "auth_softlogout_signed_out" = "Sa oled loginud välja";
 "auth_softlogout_sign_in" = "Logi sisse";
-"auth_softlogout_reason" = "Sinu koduserveri (%1$@) haldur on sind sinu kontolt  %2$@ (%3$@) välja loginud.";
+"auth_softlogout_reason" = "Sinu koduserveri (%1$@) haldur on sind sinu kontolt %2$@ (%3$@) välja loginud.";
 "room_participants_ago" = "tagasi";
 "room_participants_action_section_admin_tools" = "Haldustoimingud";
 "room_participants_action_section_devices" = "Sessioonid";
@@ -415,7 +415,7 @@
 "group_rooms_filter_rooms" = "Filtreeri kogukonna jututubasid";
 "contacts_address_book_matrix_users_toggle" = "Vaid Matrix'i kasutajad";
 "contacts_address_book_no_identity_server" = "Isikutuvastusserver ei ole seadistatud";
-"contacts_address_book_no_contact" = "Kohalikke  kasutajaid ei leidu";
+"contacts_address_book_no_contact" = "Kohalikke kasutajaid ei leidu";
 "contacts_address_book_permission_required" = "Kohalikele kasutajatele ligipääsuks on luba vaja";
 "contacts_user_directory_section" = "KASUTAJATE LOEND";
 "contacts_user_directory_offline_section" = "KASUTAJATE LOEND (ei ole võrgus)";
@@ -900,7 +900,7 @@
 // Errors
 "error_user_already_logged_in" = "Tundub, et sa üritad luua ühendust teise koduserveriga. Kas sa soovid välja logida?";
 "room_participants_action_security_status_complete_security" = "Vormista turvaseadistused lõpuni";
-"room_warning_about_encryption" = "Läbiv krüptimine on veel testimisjärgus ja ei pruugi veel olla täiesti töökindel.\n\nSeadmed ei suuda veel dekrüptida jututoa vestlusajalugu, mis pärineb jututoaga liitumise eelsest ajast.\n\nKrüptitud sõnumid pole loetavad klientides ja seadmetes, kus krüptimine pole veel toetatud.";
+"room_warning_about_encryption" = "Läbiv krüptimine on veel testimisjärgus ja ei pruugi veel olla täiesti töökindel.\n\nSeda funktsionaalsust ei saa veel täies mahus usaldada.\n\nSeadmed ei suuda veel dekrüptida jututoa vestlusajalugu, mis pärineb jututoaga liitumise eelsest ajast.\n\nKrüptitud sõnumid pole loetavad klientides ja seadmetes, kus krüptimine pole veel toetatud.";
 "secure_key_backup_setup_intro_use_security_key_info" = "Loome turvavõtme, mida sa peaksid hoidma turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.";
 "secure_key_backup_setup_intro_use_security_passphrase_title" = "Täiendavaks krüptimiseks kasuta paroolifraasi";
 "key_backup_recover_from_passphrase_info" = "Selleks, et krüptitud sõnumite ajalugu lukust lahti võtta, kasuta oma taastamiseks mõeldud paroolifraasi";
@@ -915,14 +915,14 @@
 "key_verification_verify_sas_cancel_action" = "Nad ei klapi";
 "key_verification_verify_sas_validate_action" = "Nad klapivad";
 "key_verification_verify_sas_additional_information" = "Parima turvalisuse nimel palun kasuta mõnda muud usaldusväärset suhtlusvahendit või kohtu silmast silma.";
-"key_verification_manually_verify_device_title" = "Verifitseeri  käsitsi etteantud teksti abil";
+"key_verification_manually_verify_device_title" = "Verifitseeri käsitsi etteantud teksti abil";
 "key_verification_manually_verify_device_instruction" = "Kinnita seda võrreldes järgnevaid andmeid oma teise sessiooni kasutajaseadetes:";
 "key_verification_manually_verify_device_name_title" = "Sessiooni nimi";
 "key_verification_manually_verify_device_id_title" = "Sessiooni tunnus";
 "user_verification_start_information_part1" = "Turvalisuse lisamiseks verifitseeri ";
 "user_verification_start_information_part2" = " võrreldes selleks üheks korraks loodud koodi mõlemas seadmes.";
 "user_verification_start_waiting_partner" = "Ootan vastust kasutajalt %@…";
-"user_verification_start_additional_information" = "Turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate.";
+"user_verification_start_additional_information" = "Turvalisuse mõttes on oluline, et teed seda nii, et kas olete üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate.";
 "user_verification_sessions_list_user_trust_level_trusted_title" = "Usaldusväärsed";
 "user_verification_session_details_information_trusted_current_user" = "Kuna sina oled selle sessiooni verifitseerinud, siis see sessioon on krüptitud sõnumite saatmiseks usaldusväärne:";
 "user_verification_session_details_information_trusted_other_user_part1" = "See sessioon on krüptitud sõnumite saatmiseks usaldusväärne, sest ";
@@ -1035,7 +1035,7 @@
 "user_verification_session_details_additional_information_untrusted_other_user" = "Kuni antud kasutaja seda sessiooni ei usalda, on ta märgitud hoiatussildiga. Alternatiivina on sul võimalus verifiseerimist ka käsitsi teha.";
 "user_verification_session_details_additional_information_untrusted_current_user" = "Kui sa pole sellesse sessiooni sisse loginud, siis sinu kasutajakonto andmed võivad olla sattunud valedesse kätesse.";
 "user_verification_session_details_verify_action_current_user" = "Verifitseeri interaktiivselt";
-"user_verification_session_details_verify_action_current_user_manually" = "Verifitseeri  käsitsi etteantud teksti abil";
+"user_verification_session_details_verify_action_current_user_manually" = "Verifitseeri käsitsi etteantud teksti abil";
 "user_verification_session_details_verify_action_other_user" = "Verifitseeri käsitsi";
 "secrets_recovery_with_passphrase_information_default" = "Sisestades taastamiseks mõeldud paroolifraasi, saad ligipääsu oma turvatud sõnumitele ja risttunnustamisega seotud identiteedile, mis lubab teisi sessioone verifitseerida.";
 "secrets_recovery_with_passphrase_information_verify_device" = "Kasuta taastamiseks mõeldud paroolifraasi selle seadme verifitseerimiseks.";
@@ -1187,3 +1187,18 @@
 "room_details_advanced_e2e_encryption_enabled_for_dm" = "Krüptimine on selles jututoas kasutusel";
 "room_details_advanced_e2e_encryption_disabled_for_dm" = "Krüptimine ei ole selles jututoas kasutusel.";
 "pin_protection_kick_user_alert_message" = "Liiga palju vigu PIN-koodi sisestamisel ning sa oled nüüd välja logitud";
+"secrets_reset_authentication_message" = "Kinnitamaks seda muudatust, sisesta oma konto salasõna";
+"secrets_reset_reset_action" = "Taasta algolek";
+"secrets_reset_warning_message" = "Siis alustad nii, et kadunud on ajalugu, sõnumid ning usaldatud seadmed ja kasutajad.";
+"secrets_reset_warning_title" = "Kui sa alustad kõigega algusest";
+"secrets_reset_information" = "Jätka vaid siis, kui sul pole ühtegi muud seadet, millega seda seadet saaks verifitseerida.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Alusta kõigega algusest";
+"secrets_recovery_reset_action_part_2" = "Alusta kõigega algusest";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Kas sa unustasid või kaotasid kõik võimalused taastada ligipääsu oma kontole? ";
+"less" = "Vähem";
diff --git a/Riot/Assets/hu.lproj/Localizable.strings b/Riot/Assets/hu.lproj/Localizable.strings
index f6e5546be..999240286 100644
--- a/Riot/Assets/hu.lproj/Localizable.strings
+++ b/Riot/Assets/hu.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Üzenet tőle: %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Üzenet itt: %@";
+"MESSAGE_PROTECTED" = "Új üzenet";
diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings
index 825ca5bd0..18d9cd6f9 100644
--- a/Riot/Assets/hu.lproj/Vector.strings
+++ b/Riot/Assets/hu.lproj/Vector.strings
@@ -1250,3 +1250,18 @@
 "room_info_list_one_member" = "1 tag";
 "room_info_list_several_members" = "%@ tag";
 "room_info_list_section_other" = "Más";
+"secrets_reset_authentication_message" = "A fiók jelszavaddal erősítsd meg";
+"secrets_reset_reset_action" = "Visszaállít";
+"secrets_reset_warning_message" = "Tiszta lappal indulsz, üzenetek, megbízható eszközök és felhasználók nélkül.";
+"secrets_reset_warning_title" = "Ha mindent visszaállítasz";
+"secrets_reset_information" = "Csak akkor csináld, ha nincs másik eszközöd amivel ellenőrizni tudnád ezt.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Minden visszaállítása";
+"secrets_recovery_reset_action_part_2" = "Minden visszaállítása";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Elfelejtetted vagy elveszett minden visszaállítási lehetőség? ";
+"less" = "Kevesebb";
diff --git a/Riot/Assets/it.lproj/Localizable.strings b/Riot/Assets/it.lproj/Localizable.strings
index 269e4a7c9..526b40ba6 100644
--- a/Riot/Assets/it.lproj/Localizable.strings
+++ b/Riot/Assets/it.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Messaggio da %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Messaggio in %@";
+"MESSAGE_PROTECTED" = "Nuovo messaggio";
diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings
index 7284d5d96..7f523134b 100644
--- a/Riot/Assets/it.lproj/Vector.strings
+++ b/Riot/Assets/it.lproj/Vector.strings
@@ -577,7 +577,7 @@
 "deactivate_account_informations_part3" = "\n\nDisattivare il tuo account ";
 "deactivate_account_informations_part4_emphasize" = "non eliminerà in modo automatico i messaggi che hai inviato. ";
 "deactivate_account_informations_part5" = "Se vuoi che i tuoi messaggi siano dimenticati, seleziona la casella qui sotto\n\nLa visibilità dei messaggi in Matrix è simile alle email: \"dimenticare i tuoi messaggi\" significa che quelli che hai già inviato non verranno condivisi con nessun utente nuovo o non registrato, ma gli utenti registrati che già hanno avuto accesso ai tuoi messaggi potranno ancora accedere alla loro copia.";
-"deactivate_account_forget_messages_information_part1" = "Dal momento in cui disattivo il mio account dimentica tutti i messaggi che ho inviato in precedenza  (";
+"deactivate_account_forget_messages_information_part1" = "Dal momento in cui disattivo il mio account dimentica tutti i messaggi che ho inviato in precedenza (";
 "deactivate_account_forget_messages_information_part2_emphasize" = "Attenzione";
 "deactivate_account_forget_messages_information_part3" = ": gli utenti futuri vedranno un elenco incompleto di conversazioni)";
 "deactivate_account_validate_action" = "Disattiva account";
@@ -832,7 +832,7 @@
 "settings_three_pids_management_information_part2" = "Scopri";
 "settings_three_pids_management_information_part3" = ".";
 "settings_calls_stun_server_fallback_button" = "Permetti chiamate dal Server di appoggio";
-"settings_calls_stun_server_fallback_description" = "Se il tuo Home Server non ne ha un proprio Server d'appoggio verrà usato %@  (il Server d'appoggio verrà a conoscenza del tuo indirizzo IP durante le chiamate).";
+"settings_calls_stun_server_fallback_description" = "Se il tuo Home Server non ne ha un proprio Server d'appoggio verrà usato %@ (il Server d'appoggio verrà a conoscenza del tuo indirizzo IP durante le chiamate).";
 "settings_devices_description" = "Il nome pubblico di una sessione è visibile alle persone con cui comunichi";
 "settings_discovery_no_identity_server" = "In questo momento non stai usando alcun Identity Server. Per trovare e farti trovare dagli altri utenti, configurane uno qua sotto.";
 "settings_discovery_terms_not_signed" = "Accetta i termini di servizio dell'Identity Server (%@) per permettere ad altri utenti di trovarti tramite la tua email o numero di telefono.";
@@ -1221,3 +1221,18 @@
 "room_details_advanced_e2e_encryption_enabled_for_dm" = "La crittografia è attiva";
 "room_details_advanced_e2e_encryption_disabled_for_dm" = "La crittografia non è attiva.";
 "pin_protection_kick_user_alert_message" = "Troppi errori, sei stato disconnesso";
+"secrets_reset_authentication_message" = "Inserisci la password del tuo account per confermare";
+"secrets_reset_reset_action" = "Reimposta";
+"secrets_reset_warning_message" = "Ricomincerai senza cronologia, messaggi, dispositivi o utenti fidati.";
+"secrets_reset_warning_title" = "Se reimposti tutto";
+"secrets_reset_information" = "Fallo solo se non hai altri dispositivi con cui verificare questo.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Reimposta tutto";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Dimenticato o perso tutte le opzioni di recupero? ";
+"less" = "Riduci";
+"secrets_recovery_reset_action_part_2" = "Reimposta tutto";
diff --git a/Riot/Assets/nb-NO.lproj/Vector.strings b/Riot/Assets/nb-NO.lproj/Vector.strings
index 3590d9b07..04293b0dc 100644
--- a/Riot/Assets/nb-NO.lproj/Vector.strings
+++ b/Riot/Assets/nb-NO.lproj/Vector.strings
@@ -580,3 +580,8 @@
 "biometrics_desetup_title_x" = "Skru av %@";
 "biometrics_desetup_disable_button_title_x" = "Skru av %@";
 "biometrics_cant_unlocked_alert_message_retry" = "Prøv igjen";
+"less" = "Mindre";
+"more" = "Mer";
+"switch" = "Bytt";
+"joined" = "Ble med";
+"store_promotional_text" = "Personvernbevarende chat- og samarbeidsapp på et åpent nettverk. Desentralisert for å gi deg kontroll. Ingen datamining, ingen bakdører og ingen tredjepartsadgang.";
diff --git a/Riot/Assets/pl.lproj/Vector.strings b/Riot/Assets/pl.lproj/Vector.strings
index 89705d354..70058ef7a 100644
--- a/Riot/Assets/pl.lproj/Vector.strings
+++ b/Riot/Assets/pl.lproj/Vector.strings
@@ -879,3 +879,5 @@
 "security_settings_crosssigning" = "PODPISYWANIE KRZYŻOWE";
 "security_settings_crosssigning_info_not_bootstrapped" = "Podpisywanie krzyżowe nie jest ustawione.";
 "room_info_list_section_other" = "Inne";
+"auth_phone_is_required" = "Żaden serwer tożsamości nie jest skonfigurowany, więc nie można dodać numeru telefonu w celu zresetowania hasła w przyszłości.";
+"less" = "Mniej";
diff --git a/Riot/Assets/pt_BR.lproj/Localizable.strings b/Riot/Assets/pt_BR.lproj/Localizable.strings
index 9a1f209f5..6b95f38ba 100644
--- a/Riot/Assets/pt_BR.lproj/Localizable.strings
+++ b/Riot/Assets/pt_BR.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Mensagem em %@";
 "KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ solicita confirmação";
+"MESSAGE_PROTECTED" = "Nova mensagem";
diff --git a/Riot/Assets/pt_BR.lproj/Vector.strings b/Riot/Assets/pt_BR.lproj/Vector.strings
index d1d82de57..ec1881d19 100644
--- a/Riot/Assets/pt_BR.lproj/Vector.strings
+++ b/Riot/Assets/pt_BR.lproj/Vector.strings
@@ -132,19 +132,19 @@
 "search_no_result" = "Nenhum resultado";
 "search_in_progress" = "Procurando…";
 // Directory
-"directory_cell_title" = "Procurar no diretório";
+"directory_cell_title" = "Procurar na lista";
 "directory_cell_description" = "%tu salas";
 "directory_search_results" = "%tu resultados encontrados para %@";
 "directory_search_results_more_than" = ">%tu resultados encontrados para %@";
-"directory_searching_title" = "Procurando no diretório…";
+"directory_searching_title" = "Procurando na lista…";
 // Contacts
 "contacts_address_book_section" = "CONTATOS LOCAIS";
 "contacts_address_book_matrix_users_toggle" = "Apenas usuários na Matrix";
 "contacts_address_book_no_contact" = "Nenhum contato local";
 "contacts_address_book_permission_required" = "Permissão necessária para acessar contatos locais";
 "contacts_address_book_permission_denied" = "Você não permitiu que o Element acesse seus contatos locais";
-"contacts_user_directory_section" = "DIRETÓRIO DE USUÁRIOS";
-"contacts_user_directory_offline_section" = "DIRETÓRIO DE USUÁRIOS (desconectado)";
+"contacts_user_directory_section" = "LISTA DE CONTATOS";
+"contacts_user_directory_offline_section" = "LISTA DE CONTATOS (offline)";
 // Chat participants
 "room_participants_title" = "Participantes";
 "room_participants_add_participant" = "Adicionar participantes";
@@ -158,8 +158,8 @@
 "room_creation_title" = "Nova Sala";
 "room_creation_account" = "Conta";
 // Room recents
-"room_recents_directory_section" = "DIRETÓRIO DE SALAS";
-"directory_search_results_title" = "Procurar nos resultados do diretório";
+"room_recents_directory_section" = "LISTA DE SALAS";
+"directory_search_results_title" = "Procurar nos resultados da lista";
 "directory_search_fail" = "Falha ao buscar dados";
 "auth_accept_policies" = "Por favor, revise e aceite as políticas deste servidor local:";
 "room_recents_server_notice_section" = "ALERTAS DO SISTEMA";
@@ -171,7 +171,7 @@
 "room_participants_invite_malformed_id_title" = "Erro no Convite";
 "room_participants_invited_section" = "CONVIDADO";
 "room_participants_online" = "Online";
-"room_participants_offline" = "Desconectado";
+"room_participants_offline" = "Offline";
 "room_participants_unknown" = "Desconhecido";
 "room_participants_idle" = "Ocioso";
 "room_participants_now" = "agora";
@@ -373,10 +373,10 @@
 "room_details_direct_chat" = "Chat direto";
 "room_details_access_section" = "Quem pode acessar esta sala?";
 "room_details_access_section_invited_only" = "Apenas pessoas que foram convidadas";
-"room_details_access_section_anyone_apart_from_guest" = "Quem conhece o link da sala, além dos convidados";
+"room_details_access_section_anyone_apart_from_guest" = "Quem conhece o link da sala, exceto convidados";
 "room_details_access_section_anyone" = "Qualquer pessoa que conheça o link da sala, incluindo convidados";
 "room_details_access_section_no_address_warning" = "Para ligar a uma sala, isto deve ter um endereço";
-"room_details_access_section_directory_toggle" = "Listar esta sala no diretório de salas";
+"room_details_access_section_directory_toggle" = "Listar esta sala na lista de salas";
 "room_details_history_section" = "Quem pode ler o histórico?";
 "room_details_history_section_anyone" = "Qualquer um";
 "room_details_history_section_members_only" = "Apenas participantes (desde o momento em que selecionamos esta opção)";
@@ -408,7 +408,7 @@
 "room_details_fail_to_update_topic" = "Falha ao atualizar a descrição";
 "room_details_fail_to_update_room_guest_access" = "Falha ao atualizar o acesso do convidado da sala";
 "room_details_fail_to_update_room_join_rule" = "Falha ao atualizar a regra de participação";
-"room_details_fail_to_update_room_directory_visibility" = "Falha ao atualizar a visibilidade da sala no diretório";
+"room_details_fail_to_update_room_directory_visibility" = "Falha ao atualizar a visibilidade da sala na lista";
 "room_details_fail_to_update_history_visibility" = "Falha ao atualizar a visibilidade do histórico";
 "room_details_advanced_e2e_encryption_prompt_message" = "A criptografia de ponta a ponta é experimental e pode não ser confiável.\n\nVocê ainda não deve confiar nele para proteger os dados.\n\nOs dispositivos ainda não poderão descriptografar o histórico antes de ingressarem na sala.\n\nQuando a criptografia estiver ativada para uma sala, ela não poderá ser desativada novamente (por enquanto).\n\nAs mensagens criptografadas não estarão visíveis em clientes que ainda não implementam a criptografia.";
 "room_details_fail_to_add_room_aliases" = "Falha ao adicionar os novos endereços da sala";
@@ -456,8 +456,8 @@
 "media_picker_library" = "Galeria";
 "media_picker_select" = "Selecionar";
 // Directory
-"directory_title" = "Diretório";
-"directory_server_picker_title" = "Selecionar um diretório";
+"directory_title" = "Lista";
+"directory_server_picker_title" = "Selecionar uma lista";
 "settings_display_name" = "Nome e sobrenome";
 "settings_pin_rooms_with_missed_notif" = "Fixar sala com notificações perdidas";
 "settings_pin_rooms_with_unread" = "Fixar sala com mensagens não lidas";
@@ -565,44 +565,44 @@
 "settings_key_backup" = "BACKUP DA CHAVE";
 "settings_key_backup_info" = "As mensagens criptografadas são protegidas com criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.";
 "settings_key_backup_info_checking" = "Verificando…";
-"settings_key_backup_info_none" = "Não está sendo feito backup das suas chaves nesta sessão.";
-"settings_key_backup_info_signout_warning" = "Conecte esta sessão ao backup de chaves antes de sair, para evitar a perda de chaves que possam estar apenas neste aparelho.";
-"settings_key_backup_info_version" = "Versão da chave de Backup: %@";
+"settings_key_backup_info_none" = "O backup de suas chaves não está sendo feito nesta sessão.";
+"settings_key_backup_info_signout_warning" = "Faça backup das chaves desta sessão antes de sair, para evitar a perda de chaves que estejam apenas neste aparelho.";
+"settings_key_backup_info_version" = "Versão do backup de chave: %@";
 "settings_key_backup_info_algorithm" = "Algoritmo: %@";
 "settings_key_backup_info_valid" = "Esta sessão está fazendo backup de suas chaves.";
-"settings_key_backup_info_not_valid" = "Esta sessão não está fazendo backup de suas chaves, mas você já possui um backup existente, do qual poderá restaurar e atualizar no futuro.";
+"settings_key_backup_info_not_valid" = "Esta sessão não está fazendo backup de suas chaves, mas você já possui um backup existente, o qual poderá restaurar e atualizar no futuro.";
 "settings_key_backup_info_progress" = "Fazendo o backup das chaves %@…";
 "settings_key_backup_info_progress_done" = "O Backup de todas as chaves foi realizado";
 "settings_key_backup_info_trust_signature_unknown" = "O backup tem uma assinatura da sessão com o ID: %@";
 "settings_key_backup_info_trust_signature_valid" = "O backup tem uma assinatura válida desta sessão";
-"settings_key_backup_info_trust_signature_valid_device_verified" = "O Backup tem uma assinatura válida de %@";
-"settings_key_backup_info_trust_signature_valid_device_unverified" = "O Backup tem uma assinatura de %@";
-"settings_key_backup_info_trust_signature_invalid_device_verified" = "O Backup tem uma assinatura inválida de %@";
-"settings_key_backup_info_trust_signature_invalid_device_unverified" = "O Backup tem uma assinatura inválida de %@";
-"settings_key_backup_button_create" = "Comece a usar o Backup de chave";
+"settings_key_backup_info_trust_signature_valid_device_verified" = "O backup tem uma assinatura válida de %@";
+"settings_key_backup_info_trust_signature_valid_device_unverified" = "O backup tem uma assinatura de %@";
+"settings_key_backup_info_trust_signature_invalid_device_verified" = "O backup tem uma assinatura inválida de %@";
+"settings_key_backup_info_trust_signature_invalid_device_unverified" = "O backup tem uma assinatura inválida de %@";
+"settings_key_backup_button_create" = "Comece a fazer o Backup de chave";
 "settings_key_backup_button_restore" = "Restaurar do backup";
-"settings_key_backup_button_delete" = "Excluir Backup";
+"settings_key_backup_button_delete" = "Remover backup";
 "settings_key_backup_button_use" = "Usar Backup da chave";
-"settings_key_backup_delete_confirmation_prompt_title" = "Excluir Backup";
-"settings_key_backup_delete_confirmation_prompt_msg" = "Você tem certeza? Você perderá suas mensagens criptografadas se não for feito o backup correto de suas chaves.";
+"settings_key_backup_delete_confirmation_prompt_title" = "Remover backup";
+"settings_key_backup_delete_confirmation_prompt_msg" = "Tem certeza? Você perderá suas mensagens criptografadas se não tiver feito corretamente o backup de suas chaves.";
 "room_does_not_exist" = "%@ não existe";
 // Key backup wrong version
-"e2e_key_backup_wrong_version_title" = "Novo Backup de Chave";
-"e2e_key_backup_wrong_version" = "Um novo backup de chave de mensagem segura foi detectado.\n\nSe não foi você, defina uma nova frase secreta em \"Configurações\".";
+"e2e_key_backup_wrong_version_title" = "Novo backup de chave";
+"e2e_key_backup_wrong_version" = "Um novo backup de chave foi detectado.\n\nSe não foi você, defina uma nova frase secreta em Configurações.";
 "e2e_key_backup_wrong_version_button_settings" = "Configurações";
 "e2e_key_backup_wrong_version_button_wasme" = "Foi eu";
-"key_backup_setup_title" = "Backup da Chave";
+"key_backup_setup_title" = "Backup de chave";
 "key_backup_setup_skip_alert_title" = "Você tem certeza?";
 "key_backup_setup_skip_alert_message" = "Você pode perder mensagens seguras se sair dessa sessão ou perder o seu aparelho.";
 "key_backup_setup_skip_alert_skip_action" = "Pular";
 "key_backup_setup_intro_title" = "Nunca perca mensagens criptografadas";
-"key_backup_setup_intro_info" = "As mensagens em salas criptografadas são protegidas com criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.↵\n↵\nFaça backup de suas chaves com segurança para evitar perdê-las.";
+"key_backup_setup_intro_info" = "As mensagens em salas criptografadas são protegidas com criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.\n\nFaça backup de suas chaves com segurança para evitar perdê-las.";
 "key_backup_setup_intro_setup_action_without_existing_backup" = "Comece a usar o Backup de chave";
 "key_backup_setup_intro_setup_action_with_existing_backup" = "Usar Backup de Chave";
 "key_backup_setup_intro_manual_export_info" = "(Avançado)";
 "key_backup_setup_intro_manual_export_action" = "Exportar as chaves manualmente";
 "key_backup_setup_passphrase_title" = "Proteja seu backup com uma frase secreta";
-"key_backup_setup_passphrase_info" = "Nós vamos armazenar uma cópia criptografada de suas chaves em nosso servidor. Proteja seu backup com uma frase secreta para mantê-lo seguro.\n\nPara segurança máxima, isso deve ser diferente da senha da sua conta.";
+"key_backup_setup_passphrase_info" = "Nós vamos armazenar uma cópia criptografada de suas chaves em nosso servidor. Proteja seu backup com uma frase secreta para mantê-lo seguro.\n\nPara segurança máxima, a frase secreta deve ser diferente da senha da sua conta.";
 "key_backup_setup_passphrase_passphrase_title" = "Entrar";
 "key_backup_setup_passphrase_passphrase_placeholder" = "Digite a senha";
 "key_backup_setup_passphrase_passphrase_valid" = "Ótimo!";
@@ -622,13 +622,13 @@
 // Success from recovery key
 "key_backup_setup_success_from_recovery_key_info" = "Suas chaves estão sendo copiadas.\n\nFaça uma cópia dessa chave de recuperação e mantenha-a segura.";
 "key_backup_setup_success_from_recovery_key_recovery_key_title" = "Chave de recuperação";
-"key_backup_setup_success_from_recovery_key_make_copy_action" = "Faça uma cópia";
+"key_backup_setup_success_from_recovery_key_make_copy_action" = "Fazer uma cópia";
 "key_backup_setup_success_from_recovery_key_made_copy_action" = "Eu já fiz uma cópia";
 "key_backup_recover_title" = "Mensagens seguras";
 "key_backup_recover_invalid_passphrase_title" = "Senha de recuperação incorreta";
-"key_backup_recover_invalid_passphrase" = "O Backup não pôde ser descriptografado com essa frase secreta: verifique se você digitou a frase secreta de recuperação correta.";
+"key_backup_recover_invalid_passphrase" = "O backup não pôde ser descriptografado com essa frase secreta: verifique se você digitou corretamente a frase secreta de recuperação.";
 "key_backup_recover_invalid_recovery_key_title" = "Chave de recuperação incorreta";
-"key_backup_recover_invalid_recovery_key" = "O Backup não pôde ser descriptografado com essa chave: verifique se você inseriu a chave de recuperação correta.";
+"key_backup_recover_invalid_recovery_key" = "O backup não pôde ser descriptografado com essa chave: verifique se você inseriu corretamente a chave de recuperação.";
 "key_backup_recover_from_passphrase_info" = "Use sua frase secreta de recuperação para desbloquear seu histórico de mensagens seguras";
 "key_backup_recover_from_passphrase_passphrase_title" = "Entrar";
 "key_backup_recover_from_passphrase_passphrase_placeholder" = "Digite a frase secreta";
@@ -679,12 +679,12 @@
 "secure_key_backup_setup_existing_backup_error_unlock_it" = "Desbloqueá-lo";
 "secure_key_backup_setup_existing_backup_error_delete_it" = "Apagá-lo";
 "secure_key_backup_setup_cancel_alert_title" = "Você tem certeza?";
-"secure_key_backup_setup_cancel_alert_message" = "Se você cancelar agora, poderá perder mensagens e dados criptografados, se perder o acesso aos seus logins.↵\n↵\nVocê também pode configurar o Backup Seguro e gerenciar suas chaves em Configurações.";
-"secure_backup_setup_banner_title" = "Backup Seguro";
+"secure_key_backup_setup_cancel_alert_message" = "Se você cancelar agora, poderá perder mensagens e dados criptografados, se perder o acesso aos seus logins.\n\nVocê também pode configurar o Backup online e configurar suas chaves em Configurações.";
+"secure_backup_setup_banner_title" = "Backup online";
 "secure_backup_setup_banner_subtitle" = "Proteja-se contra a perda de acesso a mensagens e dados criptografados";
 // Recover from private key
 "key_backup_recover_from_private_key_info" = "Restaurando o backup…";
-"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Comece a usar o Backup Seguro";
+"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Comece a usar o backup online";
 // MARK: - Device Verification
 "key_verification_other_session_title" = "Confirmar a sessão";
 "key_verification_new_session_title" = "Confirme sua nova sessão";
@@ -722,13 +722,13 @@
 "settings_three_pids_management_information_part3" = ".";
 "settings_security" = "SEGURANÇA";
 "settings_integrations_allow_button" = "Gerenciar integrações";
-"settings_integrations_allow_description" = "Use o Gerenciador de Integrações (%@) para gerenciar bots, pontes, widgets e pacotes de figurinhas.↵\n↵\nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.";
+"settings_integrations_allow_description" = "Use o Gerenciador de Integrações (%@) para gerenciar bots, integrações, widgets e pacotes de figurinhas.\n\nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.";
 "settings_add_3pid_password_title_email" = "Adicionar endereço de e-mail";
 "settings_discovery_three_pids_management_information_part2" = "Configurações do usuário";
 "settings_discovery_three_pids_management_information_part3" = ".";
 "settings_discovery_three_pid_details_share_action" = "Compartilhar";
 "settings_discovery_three_pid_details_revoke_action" = "Revogar";
-"service_terms_modal_description_for_integration_manager" = "Use bots, pontes, widgets e pacotes de figurinhas";
+"service_terms_modal_description_for_integration_manager" = "Use bots, integrações, widgets e pacotes de figurinhas";
 "device_verification_cancelled" = "Seu contato cancelou a confirmação.";
 // Mark: Incoming
 "device_verification_incoming_title" = "Recebendo solicitação de confirmação";
@@ -742,7 +742,7 @@
 "key_verification_scan_confirmation_scanning_device_waiting_other" = "Aguardando o outro aparelho…";
 "user_verification_start_waiting_partner" = "Aguardando %@…";
 "settings_devices_description" = "O nome público de uma sessão é visível para as pessoas com quem você se comunica";
-"security_settings_crypto_sessions_description_2" = "Se você não reconhecer um login, altere sua senha e redefina o Backup Seguro.";
+"security_settings_crypto_sessions_description_2" = "Se você não reconhecer um login, altere sua senha e refaça o backup online.";
 "security_settings_export_keys_manually" = "Exportar as chaves manualmente";
 "identity_server_settings_change" = "Alterar";
 "identity_server_settings_alert_change_title" = "Alterar o servidor de identidade";
@@ -862,7 +862,7 @@
 "settings_add_3pid_password_title_msidsn" = "Adicionar número de telefone";
 "settings_add_3pid_password_message" = "Para continuar, por favor, digite sua senha";
 "settings_add_3pid_invalid_password_message" = "Senha inválida";
-"settings_key_backup_button_connect" = "Conecte esta sessão à Cópia de Segurança (Backup) da Chave";
+"settings_key_backup_button_connect" = "Autorize esta sessão a fazer o backup de chaves";
 "settings_discovery_no_identity_server" = "No momento, você não está usando um servidor de identidade. Para descobrir e ser descoberto pelos contatos existentes, adicione um abaixo.";
 "settings_discovery_error_message" = "Um erro ocorreu. Por favor, tente novamente mais tarde.";
 "settings_discovery_three_pid_details_title_phone_number" = "Editar número de telefone";
@@ -875,8 +875,8 @@
 "security_settings_title" = "Segurança";
 "security_settings_crypto_sessions" = "MINHAS SESSÕES";
 "security_settings_crypto_sessions_loading" = "Carregando sessões…";
-"security_settings_secure_backup" = "BACKUP SEGURO";
-"security_settings_secure_backup_description" = "Previna-se contra perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de criptografia no seu servidor.";
+"security_settings_secure_backup" = "BACKUP ONLINE";
+"security_settings_secure_backup_description" = "Previna-se contra a perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de criptografia no seu servidor.";
 "security_settings_secure_backup_setup" = "Configurar";
 "security_settings_secure_backup_synchronise" = "Sincronizar";
 "security_settings_secure_backup_delete" = "Excluir";
@@ -944,15 +944,15 @@
 "service_terms_modal_title_identity_server" = "Encontrar contatos";
 "service_terms_modal_message_identity_server" = "Aceite os termos do servidor de identidade (%@) para descobrir contatos.";
 "service_terms_modal_policy_checkbox_accessibility_hint" = "Marque para aceitar %@";
-"secure_key_backup_setup_intro_title" = "Backup Seguro";
+"secure_key_backup_setup_intro_title" = "Backup online";
 "secure_key_backup_setup_intro_info" = "Previna-se contra a perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de criptografia no seu servidor.";
 "secure_key_backup_setup_intro_use_security_key_title" = "Use uma Chave de Segurança";
 "secure_key_backup_setup_intro_use_security_key_info" = "Gere uma chave de segurança para armazenar num lugar seguro, como um gerenciador de senhas ou um cofre.";
 "secure_key_backup_setup_intro_use_security_passphrase_title" = "Use uma Frase de Segurança";
 "secure_key_backup_setup_intro_use_security_passphrase_info" = "Digite uma frase secreta que só você conhece, e gere uma chave para backup.";
-"secure_key_backup_setup_existing_backup_error_title" = "Já existe um backup das mensagens";
-"secure_key_backup_setup_existing_backup_error_info" = "Desbloqueie-o para reutilizá-lo no backup seguro ou exclua-o para criar um novo backup de mensagens no backup seguro.";
-"key_backup_setup_intro_setup_connect_action_with_existing_backup" = "Conecte este aparelho ao Backup da Chave";
+"secure_key_backup_setup_existing_backup_error_title" = "Já existe um backup de mensagens";
+"secure_key_backup_setup_existing_backup_error_info" = "Desbloqueie-o para reutilizá-lo no backup online ou exclua-o para criar um novo backup de mensagens no backup online.";
+"key_backup_setup_intro_setup_connect_action_with_existing_backup" = "Autorize este aparelho a fazer o backup de chaves";
 "device_verification_incoming_description_1" = "Confirme se esta sessão é sua. Confirmar sessões fornece segurança adicional, ao usar mensagens criptografadas de ponta a ponta.";
 "device_verification_incoming_description_2" = "Se você confirmar essa sessão, você também a tornará confirmada para o seu contato.";
 // MARK: Start
@@ -1125,7 +1125,7 @@
 "secrets_setup_recovery_key_loading" = "Acessar…";
 "secrets_setup_recovery_key_export_action" = "Salvar";
 "secrets_setup_recovery_key_storage_alert_title" = "Guarde num lugar seguro";
-"secrets_setup_recovery_key_storage_alert_message" = "✓ Imprima e guarde em algum lugar seguro↵\n✓ Salve em uma chave USB ou unidade de backup↵\n✓ Copie para o seu armazenamento em nuvem pessoal";
+"secrets_setup_recovery_key_storage_alert_message" = "✓ Imprima e guarde em algum lugar seguro\n✓ Salve em uma chave USB ou unidade de backup\n✓ Copie para o seu armazenamento em nuvem pessoal";
 "secrets_setup_recovery_passphrase_title" = "Defina uma Frase de Segurança";
 "secrets_setup_recovery_passphrase_information" = "Digite uma frase de segurança que só você conheça, usada para proteger segredos em seu servidor.";
 "secrets_setup_recovery_passphrase_additional_information" = "Não use a senha da sua conta.";
@@ -1137,7 +1137,7 @@
 "major_update_title" = "Riot agora é Element";
 "major_update_learn_more_action" = "Saiba mais";
 "major_update_done_action" = "Ok, entendi";
-"pin_protection_choose_pin" = "Escolha um PIN de segurança";
+"pin_protection_choose_pin" = "Crie um PIN de segurança";
 "pin_protection_confirm_pin" = "Confirme seu PIN";
 "pin_protection_confirm_pin_to_disable" = "Confirme o PIN para desativar o PIN";
 "pin_protection_enter_pin" = "Digite seu PIN";
@@ -1160,3 +1160,76 @@
 "biometrics_cant_unlocked_alert_title" = "Não foi possível desbloquear o app";
 "biometrics_cant_unlocked_alert_message_login" = "Entrar novamente";
 "biometrics_cant_unlocked_alert_message_retry" = "Tentar novamente";
+"pin_protection_kick_user_alert_message" = "Muitos erros, vocês foi desconectada/o";
+"room_details_advanced_e2e_encryption_disabled_for_dm" = "A criptografia não está ativada nesta sala.";
+"room_details_advanced_e2e_encryption_enabled_for_dm" = "A criptografia está ativada nesta sala";
+"room_details_advanced_room_id_for_dm" = "ID:";
+"room_details_no_local_addresses_for_dm" = "Esta sala não tem endereços locais";
+"room_details_access_section_directory_toggle_for_dm" = "Exibir esta sala na lista pública de salas";
+"room_details_access_section_anyone_for_dm" = "Quem conhece o link da sala, incluindo convidados";
+"room_details_access_section_anyone_apart_from_guest_for_dm" = "Qualquer pessoa que tenha o link da sala, exceto convidados";
+"room_details_access_section_for_dm" = "Quem pode acessar esta sala?";
+"room_details_room_name_for_dm" = "Nome";
+"room_details_photo_for_dm" = "Foto";
+"room_details_title_for_dm" = "Detalhes";
+"room_participants_security_information_room_encrypted_for_dm" = "As mensagens nesta sala não estão criptografadas de ponta a ponta.\n\nSuas mensagens são protegidas com cadeados, apenas você e o destinatário têm as chaves exclusivas que permitem a leitura das mensagens.";
+"room_participants_security_information_room_not_encrypted_for_dm" = "As mensagens nesta sala não estão criptografadas de ponta a ponta.";
+"room_participants_filter_room_members_for_dm" = "Pesquisar integrantes da sala";
+"room_participants_leave_prompt_msg_for_dm" = "Deseja mesmo sair?";
+"room_participants_leave_prompt_title_for_dm" = "Sair";
+"room_info_list_section_other" = "Outros";
+"room_info_list_several_members" = "%@ integrantes";
+
+// MARK: - Room Info
+
+"room_info_list_one_member" = "1 integrante";
+"create_room_placeholder_address" = "#saladeteste:matrix.org";
+"create_room_section_header_address" = "Endereço da sala";
+"create_room_show_in_directory" = "Exibir a sala na lista pública de salas";
+"create_room_section_footer_type" = "Pessoas entram em uma sala privada apenas com o convite da sala.";
+"create_room_type_public" = "Sala pública";
+"create_room_type_private" = "Sala privada";
+"create_room_section_header_type" = "Tipo de sala";
+"create_room_section_footer_encryption" = "A criptografia não poderá ser desativada posteriormente.";
+"create_room_enable_encryption" = "Ativar criptografia";
+"create_room_section_header_encryption" = "Criptografia da sala";
+"create_room_placeholder_topic" = "Descrição";
+"create_room_section_header_topic" = "Descrição da sala (opcional)";
+"create_room_placeholder_name" = "Nome";
+"create_room_section_header_name" = "Nome da sala";
+
+// MARK: - Create Room
+
+"create_room_title" = "Nova sala";
+"searchable_directory_search_placeholder" = "Nome ou ID";
+"searchable_directory_x_network" = "Rede %@";
+
+// MARK: - Searchable Directory View Controller
+
+"searchable_directory_create_new_room" = "Criar uma nova sala";
+"pin_protection_explanatory" = "Configurar um PIN permite que você proteja dados como mensagens e contatos, de forma que somente você possa acessá-los inserindo o PIN ao iniciar o aplicativo.";
+"pin_protection_not_allowed_pin" = "Por motivos de segurança, este PIN não está disponível. Por favor, escolha outra PIN";
+"pin_protection_choose_pin_welcome_after_register" = "Boas-vindas.";
+"device_verification_self_verify_wait_recover_secrets_checking_availability" = "Procurando outras possibilidades de confirmação...";
+
+// MARK: - PIN Protection
+
+"pin_protection_choose_pin_welcome_after_login" = "Bem-vindo de volta.";
+"more" = "Mais";
+"switch" = "Alterar";
+"joined" = "Entrou";
+"secrets_reset_authentication_message" = "Digite a senha da sua conta para confirmar";
+"secrets_reset_reset_action" = "Redefinir";
+"secrets_reset_warning_message" = "Você não terá mais o histórico de mensagens, aparelhos confiáveis e contatos confirmados.";
+"secrets_reset_warning_title" = "Se você redefinir tudo";
+"secrets_reset_information" = "Apenas faça isso se você não tiver outro aparelho para confirmar este aparelho.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Remover tudo";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Esqueceu as senhas ou perdeu todas opções de recuperação? ";
+"less" = "Menos";
+"secrets_recovery_reset_action_part_2" = "Redefinir tudo";
diff --git a/Riot/Assets/ru.lproj/Localizable.strings b/Riot/Assets/ru.lproj/Localizable.strings
index b7e0d7359..f31cc61ed 100644
--- a/Riot/Assets/ru.lproj/Localizable.strings
+++ b/Riot/Assets/ru.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Сообщение от %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Сообщение в %@";
+"MESSAGE_PROTECTED" = "Новое сообщение";
diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index d0f00645a..3aeacb1b0 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -846,7 +846,7 @@
 "media_type_accessibility_sticker" = "Стикер";
 "settings_discovery_settings" = "ПОИСК";
 "settings_identity_server_settings" = "ПОИСК СЕРВЕРА";
-"settings_three_pids_management_information_part1" = "Управление адресами электронной почты или номерами телефонов, которые можно использовать для входа в систему или восстановления здесь учетной записи . Контроль над тем, кто может тебя найти ";
+"settings_three_pids_management_information_part1" = "Управление адресами электронной почты или номерами телефонов, которые можно использовать для входа в систему или восстановления здесь учетной записи. Контроль над тем, кто может тебя найти ";
 "settings_three_pids_management_information_part2" = "Поиск";
 "settings_three_pids_management_information_part3" = ".";
 "settings_calls_stun_server_fallback_button" = "Разрешить резервный вызов сервером поддержки";
@@ -1232,3 +1232,18 @@
 "room_details_advanced_e2e_encryption_enabled_for_dm" = "Шифрование включено";
 "room_details_advanced_e2e_encryption_disabled_for_dm" = "Шифрование не включено.";
 "pin_protection_kick_user_alert_message" = "Слишком много ошибок, вы вышли из системы";
+"secrets_reset_authentication_message" = "Введите пароль своей учётной записи для подтверждения";
+"secrets_reset_reset_action" = "Сброс";
+"secrets_reset_warning_message" = "Вы перезапустите приложение без истории, сообщений, доверенных устройств или доверенных пользователей.";
+"secrets_reset_warning_title" = "Если сбросить все";
+"secrets_reset_information" = "Делайте это только в том случае, если у вас нет другого устройства, с которого вы можете проверить это устройство.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Сбросить все";
+"secrets_recovery_reset_action_part_2" = "Сбросить все";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Забыли или потеряли все варианты восстановления? ";
+"less" = "Меньше";
diff --git a/Riot/Assets/sq.lproj/Localizable.strings b/Riot/Assets/sq.lproj/Localizable.strings
index 6af0109b9..b7feaff09 100644
--- a/Riot/Assets/sq.lproj/Localizable.strings
+++ b/Riot/Assets/sq.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Mesazh nga %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Mesazh te %@";
+"MESSAGE_PROTECTED" = "Mesazh i Ri";
diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings
index 93b3c9818..3172dca1f 100644
--- a/Riot/Assets/sq.lproj/Vector.strings
+++ b/Riot/Assets/sq.lproj/Vector.strings
@@ -1233,3 +1233,20 @@
 "room_details_advanced_e2e_encryption_enabled_for_dm" = "Këtu fshehtëzimi është i aktivizuar";
 "room_details_advanced_e2e_encryption_disabled_for_dm" = "Këtu fshehtëzimi s’është i aktivizuar.";
 "pin_protection_kick_user_alert_message" = "Shumë gabime, u bë nxjerrja juaj jashtë";
+"switch" = "Këmbe";
+"joined" = "Erdhi";
+"secrets_reset_authentication_message" = "Që ta ripohoni, jepni fjalëkalimin e llogarisë tuaj";
+"secrets_reset_reset_action" = "Riktheji";
+"secrets_reset_warning_message" = "Do të filloni pa historik, pa mesazhe, pajisje të besuara ose përdorues të besuar.";
+"secrets_reset_warning_title" = "Nëse ktheni gjithçka te parazgjedhjet";
+"secrets_reset_information" = "Bëjeni këtë vetëm nëse s’keni pajisje tjetër me të cilën mund të verifikoni këtë pajisje.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Riktheni gjithçka te parazgjedhjet";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Harruat ose humbët krejt mundësitë e rimarrjes? ";
+"less" = "Më pak";
+"secrets_recovery_reset_action_part_2" = "Riktheni gjithçka te parazgjedhjet";
diff --git a/Riot/Assets/sv.lproj/Localizable.strings b/Riot/Assets/sv.lproj/Localizable.strings
index ab53286b2..610be3c72 100644
--- a/Riot/Assets/sv.lproj/Localizable.strings
+++ b/Riot/Assets/sv.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 /* Incoming named video conference invite from a specific person */
 "VIDEO_CONF_NAMED_FROM_USER" = "Videogruppsamtal från %@: '%@'";
 "KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ vill verifiera";
+"MESSAGE_PROTECTED" = "Nytt meddelande";
diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings
index c979a0321..dedac7bc6 100644
--- a/Riot/Assets/sv.lproj/Vector.strings
+++ b/Riot/Assets/sv.lproj/Vector.strings
@@ -417,7 +417,7 @@
 "auth_msisdn_validation_title" = "Avvaktar verifiering";
 "auth_recaptcha_message" = "Den här hemservern vill kontrollera att du inte är en robot";
 "auth_reset_password_error_is_required" = "Ingen identitetsserver är konfigurerad: lägg till en i serveralternativen för att återställa ditt lösenord.";
-"auth_reset_password_success_message" = "Ditt lösenord har återställts.\n \nDu har loggats ut från alla sessioner och kommer inte längre att ta emot pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.";
+"auth_reset_password_success_message" = "Ditt lösenord har återställts.\n\nDu har loggats ut från alla sessioner och kommer inte längre att ta emot pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.";
 "auth_accept_policies" = "Granska och acceptera villkoren för denna hemserver:";
 "auth_softlogout_reason" = "Admin hos din hemserver (%1$@) har loggat ut dig från ditt konto %2$@ (%3$@).";
 "auth_softlogout_clear_data" = "Rensa personlig data";
@@ -1186,3 +1186,18 @@
 "room_info_list_one_member" = "1 medlem";
 "room_info_list_several_members" = "%@ medlemmar";
 "room_info_list_section_other" = "Andra";
+"secrets_reset_authentication_message" = "Ange ditt kontolösenord för att bekräfta";
+"secrets_reset_reset_action" = "Återställ";
+"secrets_reset_warning_message" = "så kommer du att börja om utan historik, meddelanden, betrodda enheter eller betrodda användare.";
+"secrets_reset_information" = "Gör bara detta om du inte har någon annan enhet att verifiera den här enheten med.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Återställ allt";
+"secrets_recovery_reset_action_part_2" = "Återställ allt";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Glömt eller förlorat alla återställningsalternativ? ";
+"less" = "Mindre";
+"secrets_reset_warning_title" = "Om du återställer allt";
diff --git a/Riot/Assets/tzm.lproj/InfoPlist.strings b/Riot/Assets/tzm.lproj/InfoPlist.strings
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Riot/Assets/tzm.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+
diff --git a/Riot/Assets/tzm.lproj/Localizable.strings b/Riot/Assets/tzm.lproj/Localizable.strings
new file mode 100644
index 000000000..3c80b883e
--- /dev/null
+++ b/Riot/Assets/tzm.lproj/Localizable.strings
@@ -0,0 +1,47 @@
+
+
+
+"MESSAGE_PROTECTED" = "Tuzint Tamaynut";
+
+/* New message indicator on a room */
+"MESSAGE_IN_X" = "Tuzint g %@";
+
+/* New message indicator from a DM */
+"MESSAGE_FROM_X" = "Tuzint seg %@";
+
+/** Notification messages **/
+
+/* New message indicator on unknown room */
+"MESSAGE" = "Tuzint";
+
+/** Image Messages **/
+
+/* New action message from a specific person, not referencing a room. */
+"IMAGE_FROM_USER" = "yuzen %@ yat twelaft %@";
+
+/* New action message from a specific person in a named room. */
+"IMAGE_FROM_USER_IN_ROOM" = "ifser%@ yat twelaft %@ g %@";
+
+/* New action message from a specific person in a named room. */
+"ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
+
+/* New action message from a specific person, not referencing a room. */
+"ACTION_FROM_USER" = "* %@ %@";
+
+/* New message from a specific person in a named room. Content included. */
+"MSG_FROM_USER_IN_ROOM_WITH_CONTENT" = "%@ g %@: %@";
+
+/** Single, unencrypted messages (where we can include the content */
+
+/* New message from a specific person, not referencing a room. Content included. */
+"MSG_FROM_USER_WITH_CONTENT" = "%@: %@";
+
+/* New message from a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM" = "ifser %@ g %@";
+
+/** Single, end-to-end encrypted messages (ie. we don't know what they say) */
+
+/* New message from a specific person, not referencing a room */
+"MSG_FROM_USER" = "yuzen%@ yat tuzint";
+/* Message title for a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ g %@";
diff --git a/Riot/Assets/tzm.lproj/Vector.strings b/Riot/Assets/tzm.lproj/Vector.strings
new file mode 100644
index 000000000..229ee0c32
--- /dev/null
+++ b/Riot/Assets/tzm.lproj/Vector.strings
@@ -0,0 +1,14 @@
+
+
+
+"more" = "Uggar";
+"joined" = "Ilkem";
+"close" = "Rgel";
+"send_to" = "Azen i %@";
+"video" = "Avidyu";
+"join" = "Lkem";
+"save" = "Ḥḍu";
+"cancel" = "Sser";
+"invite" = "Ɣer";
+"remove" = "Kkes";
+"title_people" = "Midden";
diff --git a/Riot/Assets/uk.lproj/InfoPlist.strings b/Riot/Assets/uk.lproj/InfoPlist.strings
index 762bf4d06..ba2fc5b9d 100644
--- a/Riot/Assets/uk.lproj/InfoPlist.strings
+++ b/Riot/Assets/uk.lproj/InfoPlist.strings
@@ -4,3 +4,4 @@
 "NSMicrophoneUsageDescription" = "Мікрофон використовується для відео і викликів.";
 "NSContactsUsageDescription" = "Щоб показати, які з ваших контактів вже використовують Matrix, Element може надіслати адреси електронної пошти і номери телефонів з вашої адресної книги до вашого ідентифікаційного сервера Matrix. При наявності підтримки, перед надсиланням створюється хеш особистих даних. Для докладних відомостей ознайомтеся з політикою приватності свого ідентифікаційного сервера.";
 "NSCalendarsUsageDescription" = "Переглядайте свої заплановані зустрічі в додатку.";
+"NSFaceIDUsageDescription" = "Face ID використовується для доступу до вашого додатку.";
diff --git a/Riot/Assets/uk.lproj/Localizable.strings b/Riot/Assets/uk.lproj/Localizable.strings
index 61fe38a1f..3d3b665e2 100644
--- a/Riot/Assets/uk.lproj/Localizable.strings
+++ b/Riot/Assets/uk.lproj/Localizable.strings
@@ -61,3 +61,4 @@
 "MESSAGE_FROM_X" = "Повідомлення від %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Повідомлення у %@";
+"MESSAGE_PROTECTED" = "Нове повідомлення";
diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings
index 1873b781e..49cc7bbd4 100644
--- a/Riot/Assets/uk.lproj/Vector.strings
+++ b/Riot/Assets/uk.lproj/Vector.strings
@@ -135,8 +135,8 @@
 "room_creation_wait_for_creation" = "Триває створення кімнати. Будь ласка, зачекайте.";
 "skip" = "Пропустити";
 // MARK: Clients
-"client_desktop_name" = "Десктопний Element";
-"client_web_name" = "Мережа Element";
+"client_desktop_name" = "Element Desktop";
+"client_web_name" = "Element Web";
 "client_ios_name" = "Element iOS";
 "auth_login_single_sign_on" = "Увійти за допомогою єдиного входу";
 "room_creation_invite_another_user" = "Пошук / запрошення по ідентифікатору користувача, імені або адреси електронної пошти";
@@ -160,3 +160,79 @@
 "people_invites_section" = "ЗАПРОШЕННЯ";
 "people_conversation_section" = "БАЛАЧКИ";
 "people_no_conversation" = "Нема балачок";
+"room_participants_leave_prompt_msg_for_dm" = "Ви впевненні, що бажаєте залишити?";
+"room_participants_leave_prompt_title_for_dm" = "Залишити";
+"client_android_name" = "Element Android";
+"store_promotional_text" = "Додаток для чату та сумісної роботи, що зберігає конфіденційність у відкритій мережі. Децентралізований, щоб надати вам контроль над даними. Без обробки даних, без бекдорів, без доступу для третіх сторін.";
+"settings_three_pids_management_information_part3" = ".";
+"settings_three_pids_management_information_part1" = "Керування адресами електронної пошти чи номерами телефонів, які ви можете використовувати для входу або відновлення акаунту. Контролюйте хто і як може вас знайти ";
+"contacts_address_book_no_identity_server" = "Сервер ідентифікації не налаштований";
+"auth_autodiscover_invalid_response" = "Неправильна відповідь виявлення домашнього сервера";
+"settings_key_backup" = "РЕЗЕРВНА КОПІЯ КЛЮЧІВ";
+"settings_deactivate_account" = "ДЕАКТИВУВАТИ АКАУНТ";
+"group_section" = "СПІЛЬНОТИ";
+
+// Groups tab
+"group_invite_section" = "ЗАПРОШЕННЯ";
+"settings_show_decrypted_content" = "Показувати розшифрований зміст";
+"search_in_progress" = "Пошук…";
+"contacts_user_directory_offline_section" = "КАТАЛОГ КОРИСТУВАЧІВ (offline)";
+"contacts_user_directory_section" = "КАТАЛОГ КОРИСТУВАЧІВ";
+"settings_email_address" = "Електронна пошта";
+"settings_remove_phone_prompt_msg" = "Ви впевнені, що бажаєте видалити номер телефону %@?";
+"settings_remove_email_prompt_msg" = "Ви впевнені, що бажаєте видалити адресу електронної пошти %@?";
+"settings_remove_prompt_title" = "Підтвердження";
+"settings_surname" = "Прізвище";
+"settings_first_name" = "Ім’я";
+"settings_display_name" = "Ім’я, що відображається";
+"settings_profile_picture" = "Зображення профілю";
+"settings_sign_out_e2e_warn" = "Ви втратите всі ваші ключі наскрізного шифрування. Це означає що ви більше не будете мати змогу читати старі повідомлення у зашифрованих кімнатах на цьому пристрої.";
+"settings_sign_out_confirmation" = "Ви впевнені?";
+"settings_sign_out" = "Вийти";
+"settings_cryptography" = "КРИПТОГРАФІЯ";
+"settings_devices" = "СЕАНСИ";
+"room_participants_invite_malformed_id_title" = "Помилка запрошення";
+"room_participants_invite_prompt_title" = "Підтвердження";
+"room_participants_remove_prompt_msg" = "Ви дійсно хочете видалити %@ із чату?";
+"room_participants_remove_prompt_title" = "Підтвердження";
+"room_participants_leave_prompt_msg" = "Ви дійсно бажаєте залишити кімнату?";
+"room_participants_leave_prompt_title" = "Залишити кімнату";
+"room_participants_multi_participants" = "%d учасників";
+"room_participants_one_participant" = "1 учасник";
+"room_participants_add_participant" = "Додати учасника";
+
+// Chat participants
+"room_participants_title" = "Учасники";
+"contacts_address_book_permission_denied" = "Ви не дозволили Element отримати доступ до локальних контактів";
+"contacts_address_book_permission_required" = "Необхідний дозвіл на доступ до локальних контактів";
+"contacts_address_book_no_contact" = "Немає локальних контактів";
+"contacts_address_book_matrix_users_toggle" = "Тільки користувачі Matrix";
+
+// Contacts
+"contacts_address_book_section" = "ЛОКАЛЬНІ КОНТАКТИ";
+"directory_search_fail" = "Виникла помилка при отриманні даних";
+"directory_searching_title" = "Пошук в каталозі…";
+"directory_cell_description" = "%tu кімнат";
+"search_no_result" = "Немає результатів";
+"search_people_placeholder" = "Пошук користувача за його ID, іменем або електронною поштою";
+"search_default_placeholder" = "Пошук";
+"search_files" = "Файли";
+"search_people" = "Люди";
+"search_messages" = "Повідомлення";
+
+// Search
+"search_rooms" = "Кімнати";
+
+// Rooms tab
+"room_directory_no_public_room" = "Загальнодоступних кімнат немає";
+"settings_security" = "БЕЗПЕКА";
+"settings_pin_rooms_with_missed_notif" = "Приколоти кімнати із пропущеними сповіщеннями";
+"settings_global_settings_info" = "Глобальні налаштування сповіщень доступні у вашому %@ веб-клієнті";
+"settings_enable_push_notif" = "Сповіщення на цьому пристрої";
+"settings_fail_to_update_profile" = "Не вдалося оновити профіль";
+"settings_night_mode" = "Нічний режим";
+"settings_change_password" = "Змінити пароль";
+"settings_add_phone_number" = "Додати номер телефону";
+"settings_phone_number" = "Телефон";
+"settings_add_email_address" = "Додати адресу електронної пошти";
+"settings_email_address_placeholder" = "Введіть вашу адресу електронної пошти";
diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings
index 51769fe9a..86f3f5fd7 100644
--- a/Riot/Assets/zh_Hans.lproj/Vector.strings
+++ b/Riot/Assets/zh_Hans.lproj/Vector.strings
@@ -301,7 +301,7 @@
 // Room Details
 "room_details_title" = "聊天室详情";
 "room_details_people" = "成员";
-"room_details_files" = "文件";
+"room_details_files" = "上传";
 "room_details_settings" = "设置";
 "room_details_photo" = "聊天室图片";
 "room_details_room_name" = "聊天室名称";
@@ -389,7 +389,7 @@
 // Crash report
 "google_analytics_use_prompt" = "您打算通过自动报告匿名的崩溃报告和使用数据来帮助提升 %@ 吗？";
 // Crypto
-"e2e_enabling_on_app_update" = "Element 目前支持端对端加密，但是您需要重新登录以启用它。\n\n您可以现在重新登录，也可以之后再从应用程序设置中选择开启。";
+"e2e_enabling_on_app_update" = "Element 现在支持端到端加密，但是您需要重新登录以启用它。\n\n您可以现在重新登录，也可以之后从应用程序设置中选择开启。";
 "e2e_need_log_in_again" = "您需要登录回来以便为此会话生成端对端加密密钥并提交公钥到您的主服务器。\n这只需要做一次；很抱歉造成打扰。";
 // Bug report
 "bug_report_title" = "Bug 报告";
@@ -517,7 +517,7 @@
 "deactivate_account_password_alert_title" = "注销账户";
 // Re-request confirmation dialog
 "rerequest_keys_alert_title" = "请求已发送";
-"settings_callkit_info" = "在您的锁屏界面接听 Element 来电。在系统通话记录中显示 Element 通话记录。若您已启用 iCloud，通话记录将会与 Apple 共享。";
+"settings_callkit_info" = "在锁屏上接收来电。在系统通话记录中查看你的Element通话。如果启用iCloud，此通话记录将与苹果公司共享。";
 "room_replacement_link" = "对话自此继续。";
 "room_predecessor_information" = "这个聊天室是另一个对话的延续。";
 "room_predecessor_link" = "点击此处查看更早的消息。";
@@ -588,7 +588,7 @@
 "deactivate_account_forget_messages_information_part1" = "当我的账号注销时请忘记我所有的已发送消息（";
 "deactivate_account_forget_messages_information_part3" = ": 这会导致将来加入的用户看到的是一段不完整的对话）";
 "deactivate_account_password_alert_message" = "要继续，请输入您的密码";
-"rerequest_keys_alert_message" = "请在另一台可以解密消息的设备上启动 Element ，以便将密钥发送到此会话。";
+"rerequest_keys_alert_message" = "请在另一台可以解密消息的设备上启动Element，这样它就可以将密钥发送到此会话。";
 "key_backup_setup_title" = "密钥备份";
 "key_backup_setup_skip_alert_title" = "您确定吗？";
 "key_backup_setup_skip_alert_message" = "如果您退出或丢失设备，可能会丢失安全消息。";
@@ -672,7 +672,7 @@
 "auth_reset_password_error_is_required" = "未设置身份认证服务器：在服务器选项中添加以便重设你的密码。";
 "auth_softlogout_signed_out" = "你已经登出";
 "auth_softlogout_sign_in" = "登录";
-"auth_softlogout_reason" = "你的主服务器（%1$@）管理员已将你的账号%2￥@（%3$@）登出。";
+"auth_softlogout_reason" = "你的主服务器（%1$@）管理员已将你的账号%2$@（%3$@）登出。";
 "auth_softlogout_recover_encryption_keys" = "登录以恢复单独保存在此设备上的加密密钥。你需要它们才能阅读任何设备上的安全消息。";
 "auth_softlogout_clear_data" = "清空个人信息";
 "auth_softlogout_clear_data_message_1" = "警告：你的个人信息（包括加密密钥）仍将保存在这台设备上。";
@@ -985,9 +985,9 @@
 "user_verification_session_details_verify_action_other_user" = "手动验证";
 // MARK: Clients
 "client_desktop_name" = "Element 桌面版";
-"client_web_name" = "Element Web";
-"client_ios_name" = "Element iOS";
-"client_android_name" = "Element Android";
+"client_web_name" = "Element 网页版";
+"client_ios_name" = "Element iOS版";
+"client_android_name" = "Element 安卓版";
 "room_participants_action_security_status_complete_security" = "完整安全性";
 "room_participants_action_security_status_loading" = "加载中……";
 "room_member_power_level_admin_in" = "在 %@ 的管理员";
@@ -1008,7 +1008,7 @@
 "security_settings_cryptography" = "加密";
 "security_settings_complete_security_alert_title" = "绝对安全";
 "security_settings_complete_security_alert_message" = "您应该先完成当前会话的安全防护。";
-"security_settings_coming_soon" = "抱歉的。Element iOS上尚未提供此操作。请使用其他Matrix客户端进行设置。Element iOS将使用它。";
+"security_settings_coming_soon" = "对不起。这个操作在Element iOS版本上还不可用。请使用另一个Matrix客户端来设置它。Elment iOS会使用它。";
 // Recover from private key
 "key_backup_recover_from_private_key_info" = "备份恢复中…";
 // MARK: - Device Verification
@@ -1032,7 +1032,7 @@
 "key_verification_self_verify_unverified_sessions_alert_validate_action" = "检查";
 "device_verification_self_verify_wait_title" = "绝对安全";
 "device_verification_self_verify_wait_new_sign_in_title" = "验证此登录名";
-"device_verification_self_verify_wait_information" = "从您的其他会话之一验证此会话，并授予其对加密信息的访问权限。\n\n在您的其他设备上使用最新的Element：";
+"device_verification_self_verify_wait_information" = "从您的其他会话之一验证此会话，授予它访问加密消息的权限。\n\n在您的其他设备上使用最新版的Element:";
 "device_verification_self_verify_wait_additional_information" = "或另一个支持交叉签名的Matrix客户端";
 "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "使用恢复密钥";
 "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "使用恢复密码或密钥";
diff --git a/Riot/Assets/zh_Hant.lproj/Vector.strings b/Riot/Assets/zh_Hant.lproj/Vector.strings
index 5a9858670..08a89cec6 100644
--- a/Riot/Assets/zh_Hant.lproj/Vector.strings
+++ b/Riot/Assets/zh_Hant.lproj/Vector.strings
@@ -52,7 +52,7 @@
 "auth_repeat_password_placeholder" = "確認密碼";
 "auth_repeat_new_password_placeholder" = "確認新密碼";
 "auth_home_server_placeholder" = "URL（例如 https://matrix.org）";
-"auth_identity_server_placeholder" = "URL（例如 https://matrix.org）";
+"auth_identity_server_placeholder" = "URL（例如 https://vector.im）";
 "auth_invalid_login_param" = "使用者名稱或密碼錯誤";
 "auth_invalid_user_name" = "使用者名稱只能包含英數字、點 (.)、減號 (-) 、底線 (_)";
 "auth_invalid_password" = "密碼太短（至少需要 6 個字元）";
@@ -112,7 +112,7 @@
 "room_participants_unknown" = "未知";
 "room_participants_idle" = "閒置";
 "room_participants_action_section_direct_chats" = "私聊";
-"room_participants_action_section_devices" = "裝置列表";
+"room_participants_action_section_devices" = "工作階段";
 "room_participants_action_unban" = "解除封鎖";
 "room_participants_action_start_new_chat" = "開始新聊天";
 "room_participants_action_mention" = "提及";
@@ -122,10 +122,10 @@
 "room_offline_notification" = "至伺服器的連線已遺失。";
 "room_event_action_delete" = "刪除";
 // Unknown devices
-"unknown_devices_alert_title" = "聊天室包含未知裝置";
+"unknown_devices_alert_title" = "聊天室包含未知的工作階段";
 "unknown_devices_call_anyway" = "無論如何都通話";
 "unknown_devices_answer_anyway" = "無論如何都回覆";
-"unknown_devices_title" = "未知的裝置";
+"unknown_devices_title" = "未知的工作階段";
 "settings_sign_out_confirmation" = "你確定嗎？";
 "settings_email_address" = "電子郵件";
 "settings_add_email_address" = "新增電子郵件地址";
@@ -166,7 +166,7 @@
 "e2e_room_key_request_ignore_request" = "忽略請求";
 "auth_reset_password_message" = "要重設您的密碼，輸入連結到您的帳號的電子郵件地址：";
 "auth_reset_password_email_validation_message" = "電子郵件已傳送至 %@。您必須跟隨其中包含了連結，點按下面的連結。";
-"auth_reset_password_success_message" = "您的密碼已重設。\n\n您已在所有裝置上登出，並且不會再收到推送通知。要重新啟用通知，再次於每個裝置上登入。";
+"auth_reset_password_success_message" = "您的密碼已重設。\n\n您已在所有工作階段上登出，並且不會再收到推送通知。要重新啟用通知，再次於每個裝置上登入。";
 "auth_add_email_and_phone_warning" = "直到 API 存在之前，尚不支援同時使用電子郵件地址和電話號碼註冊，因此只有電話號碼會被採用，但您可以在基本資料中新增電子郵件地址。";
 // Chat creation
 "room_creation_title" = "新的聊天";
@@ -245,7 +245,7 @@
 "room_participants_now" = "現在";
 "room_participants_ago" = "之前";
 "room_participants_action_section_admin_tools" = "管理者工具";
-"room_participants_action_section_other" = "其他";
+"room_participants_action_section_other" = "選項";
 "room_participants_action_invite" = "邀請";
 "room_participants_action_leave" = "離開這個房間";
 "room_participants_action_remove" = "從此房間踢出";
@@ -267,14 +267,14 @@
 "room_many_users_are_typing" = "%@、%@ 和 %@ 正在輸入…";
 "room_message_short_placeholder" = "傳送訊息…";
 "room_unsent_messages_notification" = "訊息未被傳送。現在 %@ 或 %@ 嗎?";
-"room_unsent_messages_unknown_devices_notification" = "由於存在未知的裝置導致訊息未被傳送。現在 %@ 或 %@ 嗎?";
+"room_unsent_messages_unknown_devices_notification" = "由於存在未知的工作階段導致訊息未被傳送。現在 %@ 或 %@ 嗎?";
 "room_conference_call_no_power" = "您需要管理此聊天室群組通話的權限";
 "room_prompt_resend" = "全部重新傳送";
 "room_prompt_cancel" = "全部取消";
 "room_resend_unsent_messages" = "重送未傳送訊息";
 "room_delete_unsent_messages" = "刪除未傳送訊息";
 "room_event_action_copy" = "複製";
-"room_event_action_redact" = "撤回";
+"room_event_action_redact" = "移除";
 "room_event_action_more" = "更多";
 "room_event_action_share" = "分享";
 "room_event_action_report" = "回報內容";
@@ -289,7 +289,7 @@
 "room_event_failed_to_send" = "傳送失敗";
 "room_action_send_photo_or_video" = "傳送照片或影片";
 "room_action_send_sticker" = "傳送貼圖";
-"unknown_devices_alert" = "此聊天室包含未經驗證的裝置。\n無法保證這些裝置屬於他們聲稱的用戶。\n我們建議在繼續操作前驗證每一個裝置，但是你也可以選擇不驗證而重新傳送該訊息。";
+"unknown_devices_alert" = "此聊天室包含未經驗證的工作階段。\n無法保證這些工作階段屬於他們聲稱的用戶。\n我們建議在繼續操作前驗證每一個工作階段，但是你也可以選擇不驗證而重新傳送該訊息。";
 "unknown_devices_send_anyway" = "無論如何都傳送";
 "unknown_devices_verify" = "驗證…";
 // Room Title
@@ -302,7 +302,7 @@
 // Room Preview
 "room_preview_invitation_format" = "您已經透過 %@ 的邀請而加入聊天室";
 "room_preview_subtitle" = "這是該聊天室的預覽。聊天室互動已被禁用。";
-"room_preview_unlinked_email_warning" = "該邀請已傳送至  %@， 但和此帳號沒有關聯。你或許會希望使用其他帳號登入，或把該電子郵件加入到你目前的帳戶。";
+"room_preview_unlinked_email_warning" = "該邀請已傳送至  %@， 但和此帳號沒有關聯。你或許會希望使用其他帳號登入，或把該電子郵件加入到你的帳戶。";
 // Settings
 "settings_title" = "設定";
 "room_preview_try_join_an_unknown_room" = "你正在嘗試訪問%@。您要加入已參加討論嗎?";
@@ -323,11 +323,11 @@
 "settings_advanced" = "進階";
 "settings_other" = "其他";
 "settings_labs" = "實驗室";
-"settings_devices" = "裝置列表";
+"settings_devices" = "工作階段列表";
 "settings_cryptography" = "加密";
 "settings_deactivate_account" = "註銷帳戶";
 "settings_sign_out" = "登出";
-"settings_sign_out_e2e_warn" = "您將失去所有點對點加密密鑰。這會使您在這台設備上無法讀取過去已加密的訊息。";
+"settings_sign_out_e2e_warn" = "您將失去所有點對點加密密鑰。這代表您將以後都無法在這台設備上讀取過去已加密的訊息。";
 "settings_profile_picture" = "個人檔案圖片";
 "settings_display_name" = "顯示名稱";
 "settings_first_name" = "名稱";
@@ -347,7 +347,7 @@
 "settings_pin_rooms_with_unread" = "釘選含有未讀訊息的聊天室";
 "settings_on_denied_notification" = "因 %@ 的通知不被允許，請在裝置設定中允許";
 "settings_enable_callkit" = "整合式通話";
-"settings_callkit_info" = "提供在鎖定畫面接聽 Element 來電、在通話紀錄中顯示 Element 通話。 如果您已啟用 iCloud ，則會與蘋果公司共享通話紀錄。";
+"settings_callkit_info" = "在鎖定畫面接聽 Element 來電、在通話紀錄中顯示 Element 通話。 如果您已啟用 iCloud ，則這些通話紀錄會與蘋果公司共享。";
 "settings_ui_language" = "語言";
 "settings_ui_theme" = "主題";
 "settings_ui_theme_auto" = "自動";
@@ -377,11 +377,11 @@
 "settings_confirm_password" = "確認密碼";
 "settings_fail_to_update_password" = "更新密碼失敗";
 "settings_password_updated" = "您的密碼已經更新";
-"settings_crypto_device_name" = "裝置名稱: ";
-"settings_crypto_device_id" = "\n裝置 ID: ";
-"settings_crypto_device_key" = "\n裝置密鑰: ";
+"settings_crypto_device_name" = "工作階段名稱: ";
+"settings_crypto_device_id" = "\n工作階段 ID: ";
+"settings_crypto_device_key" = "\n工作階段密鑰:\n";
 "settings_crypto_export" = "匯出密鑰";
-"settings_crypto_blacklist_unverified_devices" = "只匯出到已驗證的裝置";
+"settings_crypto_blacklist_unverified_devices" = "只匯出到已驗證的工作階段";
 "settings_deactivate_my_account" = "註銷我的帳號";
 // Room Details
 "room_details_title" = "聊天室詳細資料";
@@ -405,7 +405,7 @@
 "room_details_advanced_room_id" = "聊天室 ID:";
 "room_details_advanced_enable_e2e_encryption" = "啟用加密 (警告: 啟用後無法停用)";
 "room_details_advanced_e2e_encryption_disabled" = "此聊天室未啟用加密。";
-"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "只匯出到已驗證的裝置";
+"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "只匯出到已驗證的工作階段";
 "room_details_advanced_e2e_encryption_prompt_message" = "點對點加密仍在測試階段，可能不夠可靠。\n\n現在您不該認為他能保護您的資料。\n\n裝置尚未能解密在加入聊天室前的聊天紀錄。\n\n一個聊天室一旦啟用加密功能，將無法關閉 (就目前而言)。\n\n加密過的訊息將無法在尚未提供加密功能的用戶端顯示。";
 "room_details_fail_to_update_avatar" = "更新聊天室圖片失敗";
 "room_details_fail_to_update_room_name" = "更新聊天室名稱失敗";
@@ -466,7 +466,7 @@
 "event_formatter_jitsi_widget_added" = "VoIP 群組通話已由 %@ 新增";
 "event_formatter_jitsi_widget_removed" = "VoIP 群組通話已由 %@ 移除";
 "event_formatter_rerequest_keys_part1_link" = "重新請求加密金鑰";
-"event_formatter_rerequest_keys_part2" = " 從您的其他裝置。";
+"event_formatter_rerequest_keys_part2" = " 從您其他的工作階段。";
 // Others
 "or" = "或";
 "you" = "您";
@@ -490,19 +490,19 @@
 // Crash report
 "google_analytics_use_prompt" = "您願意透過自動送出匿名的崩潰報告和使用資料來幫住%@進步嗎?";
 // Crypto
-"e2e_enabling_on_app_update" = "Element 目前支援點對點加密，但您需要重新登入來啟用他。\n\n您可以現在重新登入或稍後在應用程式設定中進行。";
+"e2e_enabling_on_app_update" = "Element 目前支援點對點加密，但您需要重新登入來啟用它。\n\n您可以現在重新登入或稍後在應用程式設定中進行。";
 // Bug report
 "bug_report_title" = "錯誤回報";
 "bug_report_send_screenshot" = "傳送螢幕截圖";
 "e2e_room_key_request_start_verification" = "開始驗證…";
-"e2e_need_log_in_again" = "您需要登入回帳號以便為此設備產生點對點加密密鑰並將公鑰送出到您的家伺服器。\n這僅需要做一次，很抱歉造成您的困擾。";
+"e2e_need_log_in_again" = "您需要登入回帳號以便為此工作階段產生點對點加密密鑰並將公鑰送出到您的家伺服器。\n這僅需要做一次，很抱歉造成您的困擾。";
 "bug_crash_report_title" = "崩潰報告";
 // Widget
 "widget_no_power_to_manage" = "您需要相關權限以管理此聊天室的 widget";
 "widget_creation_failure" = "建立 Widget 失敗";
 "widget_sticker_picker_no_stickerpacks_alert" = "您目前沒有啟用任何貼圖。";
 "widget_sticker_picker_no_stickerpacks_alert_add_now" = "現在新增一些嗎?";
-"rerequest_keys_alert_message" = "請在其他可解密訊息的裝置開啟 Element 以將密鑰傳送到此裝置。";
+"rerequest_keys_alert_message" = "請在其他可解密訊息的裝置開啟 Element 以將密鑰傳送到此工作階段。";
 "bug_report_description" = "請描述此錯誤。您做了什麼? 本來應該發生什麼? 以及實際發生什麼?";
 "bug_crash_report_description" = "請描述您在崩潰前做了什麼:";
 "bug_report_logs_description" = "為了診斷問題，此用戶端的記錄檔將會隨此錯誤報告送出。 如果您只想傳送上面的文字，請取消:";
@@ -512,8 +512,8 @@
 // Share extension
 "share_extension_auth_prompt" = "登入主應用程式以分享內容";
 "share_extension_failed_to_encrypt" = "傳送失敗。 檢查主應用程式對此聊天室的加密設定";
-"e2e_room_key_request_message_new_device" = "您新增的裝置 '%@'， 正在請求加密密鑰。";
-"e2e_room_key_request_message" = "您未驗證的裝置 '%@' 正在請求加密密鑰。";
+"e2e_room_key_request_message_new_device" = "您新增的工作階段 '%@'， 正在請求加密密鑰。";
+"e2e_room_key_request_message" = "您未驗證的工作階段 '%@' 正在請求加密密鑰。";
 // GDPR
 "gdpr_consent_not_given_alert_message" = "如要繼續使用此家伺服器，您必須同意該合約條款。";
 "gdpr_consent_not_given_alert_review_now_action" = "現在重新檢視";
@@ -541,3 +541,99 @@
 "room_predecessor_information" = "此聊天室是另一對話的延續。";
 "settings_labs_room_members_lazy_loading" = "延遲載入聊天室成員";
 "settings_labs_room_members_lazy_loading_error_message" = "您的家伺服器尚未支援延遲載入聊天室成員。 請稍後再試。";
+
+// Service terms
+"service_terms_modal_title" = "服務條款";
+
+// Banner
+
+"secure_backup_setup_banner_title" = "安全備份";
+
+
+// Cancel
+
+"secure_key_backup_setup_cancel_alert_title" = "你確定嗎？";
+"secure_key_backup_setup_existing_backup_error_delete_it" = "刪除";
+"secure_key_backup_setup_existing_backup_error_unlock_it" = "解鎖";
+"secure_key_backup_setup_intro_use_security_key_title" = "使用安全密鑰";
+
+// MARK: Secure backup setup
+
+// Intro
+
+"secure_key_backup_setup_intro_title" = "安全備份";
+"service_terms_modal_message_identity_server" = "接受身份伺服器（%@）的條款以尋找聯繫人。";
+
+
+// MARK: Key backup setup
+
+"key_backup_setup_title" = "密鑰備份";
+"room_accessiblity_scroll_to_bottom" = "滾動到底部";
+"room_message_unable_open_link_error_message" = "無法打開鏈接。";
+"room_member_power_level_short_custom" = "自訂";
+"room_member_power_level_short_moderator" = "版主";
+"room_member_power_level_short_admin" = "管理員";
+"room_member_power_level_custom_in" = "%@ 中的自訂 (%@)";
+"room_member_power_level_moderator_in" = "%@的版主";
+"room_member_power_level_admin_in" = "%@中的管理員";
+"room_participants_security_information_room_encrypted_for_dm" = "此處的消息是端到端加密的。\n\n您的訊息已被加密保護，只有您和收件人才能使用唯一的密鑰來解鎖。";
+"room_participants_security_information_room_encrypted" = "此聊天室內的消息是端到端加密的。\n\n您的訊息已被加密保護，只有您和收件人才能使用唯一的密鑰來解鎖。";
+"room_participants_security_information_room_not_encrypted_for_dm" = "這裡的訊息並沒有端到端加密。";
+"room_participants_security_information_room_not_encrypted" = "此聊天室內的訊息未進行端到端加密。";
+"room_participants_security_loading" = "載入中…";
+"room_participants_action_security_status_loading" = "載入中…";
+"room_participants_action_security_status_warning" = "警告";
+"room_participants_action_security_status_complete_security" = "全面的安全性";
+"room_participants_action_security_status_verified" = "已驗證";
+"room_participants_action_security_status_verify" = "驗證";
+"room_participants_action_section_security" = "保安";
+"room_participants_start_new_chat_error_using_user_email_without_identity_server" = "沒有配置身份伺服器，因此您無法使用電子郵件與聯繫人開始聊天。";
+"room_participants_filter_room_members_for_dm" = "篩選成員";
+"room_participants_leave_prompt_msg_for_dm" = "您確定要離開嗎？";
+"room_participants_remove_third_party_invite_prompt_msg" = "您確定要撤消此邀請嗎？";
+"room_participants_leave_prompt_title_for_dm" = "離開";
+"room_recents_server_notice_section" = "系統警報";
+"room_creation_error_invite_user_by_email_without_identity_server" = "沒有配置身份伺服器，因此您無法為用戶添加電子郵件。";
+
+// Errors
+"error_user_already_logged_in" = "您似乎正在嘗試連接到另一個自家伺服器。 您要登出嗎？";
+"auth_softlogout_clear_data_sign_out" = "登出";
+"auth_softlogout_clear_data_sign_out_msg" = "您確定要清除當前存儲在此設備上的所有數據嗎？ 再次登錄以存取您的帳戶數據和消訊息。";
+"auth_softlogout_clear_data_sign_out_title" = "你確定嗎？";
+"auth_softlogout_clear_data_button" = "清除所有數據";
+"auth_softlogout_clear_data_message_2" = "如果您已使用完畢此設備，或想登錄另一個帳戶，請先登出。";
+"auth_softlogout_clear_data_message_1" = "警告：您的個人數據（包括加密密鑰）仍存儲在此設備上。";
+"auth_softlogout_clear_data" = "清除個人資料";
+"auth_softlogout_recover_encryption_keys" = "登入以恢復專門存儲在此設備上的加密密鑰。 您需要他們在任何設備上閱讀所有安全的訊息。";
+"auth_softlogout_reason" = "您的自家伺服器 (%1$@) 管理員已登出您的帳戶 %2$@ (%3$@)。";
+"auth_softlogout_sign_in" = "登入";
+"auth_softlogout_signed_out" = "你已登出";
+"auth_autodiscover_invalid_response" = "無效的自家伺服器發現回應";
+"auth_accept_policies" = "請查看並接受此自家伺服器的策略：";
+"auth_reset_password_error_is_required" = "未配置身份伺服器：在伺服器選項中添加一個以便日後重置密碼。";
+"auth_forgot_password_error_no_configured_identity_server" = "未配置身份伺服器：添加一台以便重置密碼。";
+"auth_phone_is_required" = "沒有配置身份伺服器，因此您無法添加電話號碼以便將來重設密碼。";
+"auth_email_is_required" = "沒有配置身份伺服器，因此您無法添加電子郵件地址以便將來重設密碼。";
+"auth_add_email_phone_message_2" = "設置一個電子郵件以便日後恢復帳戶和使以後可以由認識您的人發現你。";
+"auth_add_email_message_2" = "設置一個電子郵件以便日後恢復帳戶和使以後可以由認識您的人發現你。";
+"auth_add_phone_message_2" = "設置一個電話號碼，以後可以由認識您的人發現你。";
+"auth_login_single_sign_on" = "以單一登入方式登入";
+"client_android_name" = "Element Android版";
+"client_ios_name" = "Element iOS版";
+"client_web_name" = "Element 網頁版";
+
+// MARK: Clients
+"client_desktop_name" = "Element 桌面版";
+
+// Accessibility
+"accessibility_checkbox_label" = "複選框";
+"less" = "減少";
+"more" = "更多";
+"switch" = "轉換";
+"joined" = "已加入";
+"skip" = "跳過";
+"close" = "關閉";
+"store_promotional_text" = "開放網絡上的隱私保護聊天和協作應用程序。 去中心化管理。 沒有數據挖掘，沒有後門，也沒有第三方存取。";
+"store_full_description" = "Element是一種新型的通訊和協作應用程式，它可以使你：\n\n1.掌控您的隱私\n2.可以與Matrix網絡中的任何人進行通信，甚至可以與Slack等應用程式整合\n3.保護您免受廣告，數據挖掘，後門和封閉平台的侵害\n4.通過端到端加密和交互簽名來驗證他人，從而保護您的安全\n\nElement是去中心化的開源軟件，因此與其他通訊和協作應用程式完全不同。\n\nElement允許您自行架設（或選擇託管）伺服器，使您擁有隱私權，所有權以及對數據和會話的控制權。自行架設的伺服器可以使您訪問開放的網絡；因此，您不僅可以只與其他 Element 用戶聊天。而且非常安全。\n\nElement之所以能夠達至所有這些目標，是因為它在Matrix（開放，去中心化通信的標準）上運行。\n\nElement通過讓您選擇託管對話的伺服器來控制您的訊息和資料。在Element應用程式中，您可以選擇以不同方式託管你的訊息：\n\n1.在matrix.org公共伺服器上獲得一個免費帳戶\n2.通過在自己的硬件上架設伺服器來託管帳戶\n3.訂閱Element Matrix Services託管平台，即可在自定伺服器上註冊帳戶\n\n為什麼選擇Element？\n\n擁有您的數據：您可以決定將數據和訊息保留在何處。您擁有並控制它，而不是某些超大型企業一樣，會挖掘您的數據或把數據提供給第三方。\n\n開放的通訊和協作：您可以與Matrix網絡中的任何人聊天，無論他們使用的是Element還是其他Matrix應用程式，甚至他們使用的是Slack，IRC或XMPP之類的其他通訊系統。\n\n超級安全：真正的端到端加密（只有對話中的人才能解密消息），並進行交互簽名以驗證對話參與者的設備。\n\n完整的通信：文字通訊，語音和視像通話，文件共享，屏幕共享以及大量整合，機器人和小部件。建立房間、社群，保持聯繫並完成工作。\n\n無論您身在何處都可保持聯繫：無論您身在何處，都可以通過 https://element.io/app 在所有設備和網絡上完全同步訊息歷史記錄來保持聯繫。";
+// String for App Store
+"store_short_description" = "去中心化的安全通訊軟件";
diff --git a/Riot/Managers/Analytics/Analytics.h b/Riot/Managers/Analytics/Analytics.h
index a57a7622c..03870bef7 100644
--- a/Riot/Managers/Analytics/Analytics.h
+++ b/Riot/Managers/Analytics/Analytics.h
@@ -18,6 +18,12 @@
 
 #import <MatrixSDK/MatrixSDK.h>
 
+
+// Metrics related to notifications
+FOUNDATION_EXPORT NSString *const AnalyticsNoficationsCategory;
+FOUNDATION_EXPORT NSString *const AnalyticsNoficationsTimeToDisplayContent;
+
+
 /**
  `Analytics` sends analytics to an analytics tool.
  */
diff --git a/Riot/Managers/Analytics/Analytics.m b/Riot/Managers/Analytics/Analytics.m
index faa8ac674..2786f0964 100644
--- a/Riot/Managers/Analytics/Analytics.m
+++ b/Riot/Managers/Analytics/Analytics.m
@@ -19,6 +19,10 @@
 #import "Riot-Swift.h"
 
 
+NSString *const AnalyticsNoficationsCategory = @"notifications";
+NSString *const AnalyticsNoficationsTimeToDisplayContent = @"timelineDisplay";
+
+
 // Duration data will be visible under the Piwik category called "Performance".
 // Other values will be visible in "Metrics".
 // Some Matomo screenshots are available at https://github.com/vector-im/element-ios/pull/3789.
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 6a28738a5..59fc4153b 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -204,7 +204,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
      The launch animation container view
      */
     UIView *launchAnimationContainerView;
-    NSDate *launchAnimationStart;
 }
 
 @property (strong, nonatomic) UIAlertController *mxInAppNotification;
@@ -454,9 +453,15 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     _handleSelfVerificationRequest = YES;
     
     // Configure our analytics. It will indeed start if the option is enabled
-    [MXSDKOptions sharedInstance].analyticsDelegate = [Analytics sharedInstance];
+    Analytics *analytics = [Analytics sharedInstance];
+    [MXSDKOptions sharedInstance].analyticsDelegate = analytics;
     [DecryptionFailureTracker sharedInstance].delegate = [Analytics sharedInstance];
-    [[Analytics sharedInstance] start];
+    
+    MXBaseProfiler *profiler = [MXBaseProfiler new];
+    profiler.analytics = analytics;
+    [MXSDKOptions sharedInstance].profiler = profiler;
+    
+    [analytics start];
 
     self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]];
 
@@ -588,6 +593,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     
     [self.pushNotificationService applicationDidEnterBackground];
     
+    // Pause profiling
+    [MXSDKOptions.sharedInstance.profiler pause];
+    
     // Analytics: Force to send the pending actions
     [[DecryptionFailureTracker sharedInstance] dispatch];
     [[Analytics sharedInstance] dispatch];
@@ -599,6 +607,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     
     // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 
+    [MXSDKOptions.sharedInstance.profiler resume];
+    
     // Force each session to refresh here their publicised groups by user dictionary.
     // When these publicised groups are retrieved for a user, they are cached and reused until the app is backgrounded and enters in the foreground again
     for (MXSession *session in mxSessionArray)
@@ -1099,6 +1109,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 
 - (void)pushNotificationService:(PushNotificationService *)pushNotificationService shouldNavigateToRoomWithId:(NSString *)roomId
 {
+    [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:AnalyticsNoficationsTimeToDisplayContent
+                                                            category:AnalyticsNoficationsCategory];
+    
     _lastNavigatedRoomIdFromPush = roomId;
     [self navigateToRoomById:roomId];
 }
@@ -2409,7 +2422,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         [window addSubview:launchLoadingView];
         
         launchAnimationContainerView = launchLoadingView;
-        launchAnimationStart = [NSDate date];
+        
+        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:kMXAnalyticsStartupLaunchScreen
+                                                        category:kMXAnalyticsStartupCategory];
     }
 }
 
@@ -2417,16 +2432,14 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 {
     if (launchAnimationContainerView)
     {
-        NSTimeInterval duration = [[NSDate date] timeIntervalSinceDate:launchAnimationStart];
-        NSLog(@"[AppDelegate] hideLaunchAnimation: LaunchAnimation was shown for %.3fms", duration * 1000);
-        
-        // Track it on our analytics
-        [[MXSDKOptions sharedInstance].analyticsDelegate trackDuration:duration
-                                                              category:kMXAnalyticsStartupCategory
-                                                                  name:kMXAnalyticsStartupLaunchScreen];
-        
-        // TODO: Send durationMs to Piwik
-        // Such information should be the same on all platforms
+        id<MXProfiler> profiler = MXSDKOptions.sharedInstance.profiler;
+        MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:kMXAnalyticsStartupLaunchScreen category:kMXAnalyticsStartupCategory];
+        if (launchTaskProfile)
+        {
+            [profiler stopMeasuringTaskWithProfile:launchTaskProfile];
+            
+            NSLog(@"[AppDelegate] hideLaunchAnimation: LaunchAnimation was shown for %.3fms", launchTaskProfile.duration * 1000);
+        }
         
         [self->launchAnimationContainerView removeFromSuperview];
         self->launchAnimationContainerView = nil;
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index d63d9f0da..04a76afa6 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -204,6 +204,9 @@
     
     // Formatted body parser for events
     FormattedBodyParser *formattedBodyParser;
+    
+    // Time to display notification content in the timeline
+    MXTaskProfile *notificationTaskProfile;
 }
 
 @property (nonatomic, weak) IBOutlet UIView *overlayContainerView;
@@ -500,6 +503,9 @@
         [self startActivityIndicator];
         [self.roomDataSource reload];
         [LegacyAppDelegate theDelegate].lastNavigatedRoomIdFromPush = nil;
+        
+        notificationTaskProfile = [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:AnalyticsNoficationsTimeToDisplayContent
+                                                                                          category:AnalyticsNoficationsCategory];
     }
 }
 
@@ -842,6 +848,18 @@
     self.updateRoomReadMarker = NO;
 }
 
+- (void)stopActivityIndicator
+{
+    if (notificationTaskProfile)
+    {
+        // Consider here we have displayed the message corresponding to the notification
+        [MXSDKOptions.sharedInstance.profiler stopMeasuringTaskWithProfile:notificationTaskProfile];
+        notificationTaskProfile = nil;
+    }
+    
+    [super stopActivityIndicator];
+}
+
 - (void)displayRoom:(MXKRoomDataSource *)dataSource
 {
     // Remove potential preview Data